Skip to content
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.

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

Implemented Primitive Domain Socket Support described in https://github.com/v2ray/Planning/issues/25 #1019

Merged
merged 31 commits into from
Apr 9, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
71c3e81
Rebase: Add domainsocket receiver config
xiaokangwang Feb 12, 2018
d845b4c
Created listener file
xiaokangwang Oct 31, 2017
c3cdd90
fix and generate protobuf
xiaokangwang Oct 31, 2017
fdfa49d
modify golang package name
xiaokangwang Oct 31, 2017
5a7c49f
Added Generated error helper
xiaokangwang Nov 3, 2017
a6612a2
Regenerate Pb
xiaokangwang Nov 3, 2017
8fe5326
Added function Stub
xiaokangwang Nov 3, 2017
b9dddd0
Added Dialer stub
xiaokangwang Nov 22, 2017
7afd26a
Type switch for UnixReceiver
xiaokangwang Dec 28, 2017
7b51a56
Fix pb err
xiaokangwang Dec 28, 2017
7f34cbd
Add Generated Files
xiaokangwang Dec 28, 2017
5e0ed59
added function stub for UnixReceiverHandler Instancer
xiaokangwang Dec 28, 2017
91f32cc
Auto Gen
xiaokangwang Feb 12, 2018
43abfc9
Unix listeners(sync commit)
xiaokangwang Mar 11, 2018
8e5063d
(Sync Commit)
xiaokangwang Mar 16, 2018
3b1f0ae
finish transport listener
xiaokangwang Mar 18, 2018
3e05a35
finish UnixInboundHandler
xiaokangwang Mar 18, 2018
09bf78a
notify progressTraffic to quit
xiaokangwang Mar 18, 2018
a00c076
Pass unused data into Receiver
xiaokangwang Mar 28, 2018
b67cd22
Test and bug fix
xiaokangwang Mar 29, 2018
c51830b
Added UnixSenderConfig
xiaokangwang Apr 4, 2018
7e96581
Added integration
xiaokangwang Apr 4, 2018
176a5c0
generalize interface
xiaokangwang Apr 4, 2018
d08929a
finish up dial
xiaokangwang Apr 5, 2018
4e609c9
Added Test for dial
xiaokangwang Apr 5, 2018
8b881d7
Rename to prevent confusion
xiaokangwang Apr 5, 2018
12012cd
Testing and fixs
xiaokangwang Apr 5, 2018
c542c04
Merge branch 'master' of github.com:v2ray/v2ray-core into domainsocket
xiaokangwang Apr 5, 2018
8e1507a
Prevent unuseful test failure
xiaokangwang Apr 5, 2018
6d1faf5
Remove staging code
xiaokangwang Apr 5, 2018
00016e0
Add comment
xiaokangwang Apr 6, 2018
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
Prev Previous commit
Next Next commit
(Sync Commit)
  • Loading branch information
xiaokangwang committed Mar 16, 2018
commit 8e5063dedf169e73854be0829af63bf39a49d1a9
5 changes: 4 additions & 1 deletion app/proxyman/inbound/unix.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@ type UnixInboundHandler struct {
func (uih *UnixInboundHandler) Start() {
var err error
uih.listenerHolder, err = domainsocket.ListenDS(uih.ctx, uih.path)
newError(err).AtError().WriteToLog()
if err != nil {
newError(err).AtError().WriteToLog()
}

}
func (uih *UnixInboundHandler) Close() {
if uih.listenerHolder != nil {
Expand Down
65 changes: 58 additions & 7 deletions transport/internet/domainsocket/listener.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,75 @@ package domainsocket
import (
"context"
"net"
"os"
"syscall"
)

type Listener struct {
ln net.Listener
ln net.Listener
listenerChan <-chan net.Conn
ctx context.Context
path string
lockfile os.File
}

func ListenDS(ctx context.Context, path string) (*Listener, error) {

vln := &Listener{path: path}
return vln, nil
}

func (ls *Listener) Down() error {
err := ls.ln.Close()
if err != nil {
newError(err).AtDebug().WriteToLog()
}
return err
}

//Setup systen level Listener
func (ls *Listener) LowerUP() error {

if isUnixDomainSocketFileSystemBased(ls.path) && !___DEBUG_IGNORE_FLOCK {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the unix domain socket is filesystem based, an file lock must be used to claim the right for listening on respective file.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please put this comment into source code.


}

addr := new(net.UnixAddr)
addr.Name = path
addr.Name = ls.path
addr.Net = "unix"
li, err := net.ListenUnix("unix", addr)
if err != nil {
return nil, err
return err
}
vln := &Listener{ln: li}
return vln, nil

}

func (ls *Listener) Down() {
ls.ln.Close()
func isUnixDomainSocketFileSystemBased(path string) bool {
//No Branching
return path[0] != 0
}

func AcquireLock(lockfilepath string) (*os.File, error) {
f, err := os.Create(lockfilepath)
if err != nil {
newError(err).AtDebug().WriteToLog()
return f, err
}
err = syscall.Flock(int(f.Fd()), syscall.LOCK_EX)
if err != nil {
newError(err).AtDebug().WriteToLog()
err = f.Close()
if err != nil {
if ___DEBUG_PANIC_WHEN_ENCOUNTED_IMPOSSIBLE_ERROR {
panic(err)
}
newError(err).AtDebug().WriteToLog()
}
return nil, err
}
}

//DEBUG CONSTS
const ___DEBUG_IGNORE_FLOCK = false
const ___DEBUG_PANIC_WHEN_ERROR_UNPROPAGATEABLE = false
const ___DEBUG_PANIC_WHEN_ENCOUNTED_IMPOSSIBLE_ERROR = false