Skip to content

Allow setting of the local listener address #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kernle32dll wants to merge 1 commit into
base: mainline
Choose a base branch
from
Open

Allow setting of the local listener address #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/sessionmanagerplugin/session/portsession/basicportforwarding.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,14 +143,18 @@ func (p *BasicPortForwarding) startLocalConn(log log.T) (err error) {
// startLocalListener starts a local listener to given address
func (p *BasicPortForwarding) startLocalListener(log log.T, portNumber string) (listener net.Listener, err error) {
var displayMessage string
localListenerAddress := p.portParameters.LocalListenerAddress
if localListenerAddress == "" {
localListenerAddress = "localhost"
}
switch p.portParameters.LocalConnectionType {
case "unix":
if listener, err = getNewListener(p.portParameters.LocalConnectionType, p.portParameters.LocalUnixSocket); err != nil {
return
}
displayMessage = fmt.Sprintf("Unix socket %s opened for sessionId %s.", p.portParameters.LocalUnixSocket, p.sessionId)
default:
if listener, err = getNewListener("tcp", "localhost:"+portNumber); err != nil {
if listener, err = getNewListener("tcp", localListenerAddress+":"+portNumber); err != nil {
return
}
// get port number the TCP listener opened
Expand Down
6 changes: 5 additions & 1 deletion src/sessionmanagerplugin/session/portsession/muxportforwarding.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,11 @@ func (p *MuxPortForwarding) handleClientConnections(log log.T, ctx context.Conte
if p.portParameters.LocalPortNumber == "" {
localPortNumber = "0"
}
if listener, err = net.Listen("tcp", "localhost:"+localPortNumber); err != nil {
localListenerAddress := p.portParameters.LocalListenerAddress
if localListenerAddress == "" {
localListenerAddress = "localhost"
}
if listener, err = net.Listen("tcp", localListenerAddress+":"+localPortNumber); err != nil {
return err
}
p.portParameters.LocalPortNumber = strconv.Itoa(listener.Addr().(*net.TCPAddr).Port)
Expand Down
11 changes: 6 additions & 5 deletions src/sessionmanagerplugin/session/portsession/portsession.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,12 @@ type IPortSession interface {
}

type PortParameters struct {
PortNumber string `json:"portNumber"`
LocalPortNumber string `json:"localPortNumber"`
LocalUnixSocket string `json:"localUnixSocket"`
LocalConnectionType string `json:"localConnectionType"`
Type string `json:"type"`
PortNumber string `json:"portNumber"`
LocalPortNumber string `json:"localPortNumber"`
LocalUnixSocket string `json:"localUnixSocket"`
LocalConnectionType string `json:"localConnectionType"`
LocalListenerAddress string `json:"localListenerAddress"`
Type string `json:"type"`
}

func init() {
Expand Down