Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Sshutil
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mirrored_repos
smallstep
Sshutil
Commits
199671d0
Commit
199671d0
authored
4 years ago
by
David Cowden
Browse files
Options
Downloads
Patches
Plain Diff
server: Change error prefix from ssh to sshutil
Convention is to use package name.
parent
0ff4444d
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
server.go
+5
-5
5 additions, 5 deletions
server.go
with
5 additions
and
5 deletions
server.go
+
5
−
5
View file @
199671d0
...
...
@@ -172,7 +172,7 @@ func (srv *Server) init() error {
// ErrServerClosed is returned from ListenAndServe and Serve when either
// method returnd due to a call to Close or Shutdown.
var
ErrServerClosed
=
errors
.
New
(
"ssh: Server closed"
)
var
ErrServerClosed
=
errors
.
New
(
"ssh
util
: Server closed"
)
// ListenAndServe blocks listening on Server.Addr. If Addr is empty, the
// server listens on localhost:22, the ssh port. The returned error is never
...
...
@@ -491,7 +491,7 @@ func (srv *Server) GlobalRequest(reqType string, h RequestHandler) error {
defer
srv
.
mu
.
Unlock
()
_
,
exists
:=
srv
.
GlobalRequests
[
reqType
]
if
exists
{
return
fmt
.
Errorf
(
"ssh: request name '%s' already registered"
,
reqType
)
return
fmt
.
Errorf
(
"ssh
util
: request name '%s' already registered"
,
reqType
)
}
srv
.
GlobalRequests
[
reqType
]
=
h
return
nil
...
...
@@ -507,7 +507,7 @@ func (srv *Server) Channel(name string, handler ChannelHandler) error {
defer
srv
.
mu
.
Unlock
()
_
,
exists
:=
srv
.
ChannelHandlers
[
name
]
if
exists
{
return
fmt
.
Errorf
(
"ssh: channel name '%s' already registered"
,
name
)
return
fmt
.
Errorf
(
"ssh
util
: channel name '%s' already registered"
,
name
)
}
srv
.
ChannelHandlers
[
name
]
=
handler
return
nil
...
...
@@ -521,7 +521,7 @@ func (srv *Server) trackListener(ln net.Listener) error {
defer
srv
.
mu
.
Unlock
()
_
,
exists
:=
srv
.
listeners
[
ln
]
if
exists
{
return
errors
.
New
(
"ssh: listener already registered"
)
return
errors
.
New
(
"ssh
util
: listener already registered"
)
}
srv
.
listeners
[
ln
]
=
struct
{}{}
return
nil
...
...
@@ -542,7 +542,7 @@ func (srv *Server) trackConnection(c *ServerConn) error {
defer
srv
.
mu
.
Unlock
()
_
,
exists
:=
srv
.
connections
[
id
]
if
exists
{
return
errors
.
New
(
"ssh: connection already registered"
)
return
errors
.
New
(
"ssh
util
: connection already registered"
)
}
srv
.
connections
[
id
]
=
c
return
nil
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment