-
Notifications
You must be signed in to change notification settings - Fork 8.9k
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
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 d845b4c
Created listener file
xiaokangwang c3cdd90
fix and generate protobuf
xiaokangwang fdfa49d
modify golang package name
xiaokangwang 5a7c49f
Added Generated error helper
xiaokangwang a6612a2
Regenerate Pb
xiaokangwang 8fe5326
Added function Stub
xiaokangwang b9dddd0
Added Dialer stub
xiaokangwang 7afd26a
Type switch for UnixReceiver
xiaokangwang 7b51a56
Fix pb err
xiaokangwang 7f34cbd
Add Generated Files
xiaokangwang 5e0ed59
added function stub for UnixReceiverHandler Instancer
xiaokangwang 91f32cc
Auto Gen
xiaokangwang 43abfc9
Unix listeners(sync commit)
xiaokangwang 8e5063d
(Sync Commit)
xiaokangwang 3b1f0ae
finish transport listener
xiaokangwang 3e05a35
finish UnixInboundHandler
xiaokangwang 09bf78a
notify progressTraffic to quit
xiaokangwang a00c076
Pass unused data into Receiver
xiaokangwang b67cd22
Test and bug fix
xiaokangwang c51830b
Added UnixSenderConfig
xiaokangwang 7e96581
Added integration
xiaokangwang 176a5c0
generalize interface
xiaokangwang d08929a
finish up dial
xiaokangwang 4e609c9
Added Test for dial
xiaokangwang 8b881d7
Rename to prevent confusion
xiaokangwang 12012cd
Testing and fixs
xiaokangwang c542c04
Merge branch 'master' of github.com:v2ray/v2ray-core into domainsocket
xiaokangwang 8e1507a
Prevent unuseful test failure
xiaokangwang 6d1faf5
Remove staging code
xiaokangwang 00016e0
Add comment
xiaokangwang File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
finish transport listener
- Loading branch information
commit 3b1f0ae300f9fed247d2192109afc930e763a1ea
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,53 +5,157 @@ import ( | |
"net" | ||
"os" | ||
"syscall" | ||
"time" | ||
|
||
"v2ray.com/core/common/bitmask" | ||
) | ||
|
||
type Listener struct { | ||
ln net.Listener | ||
listenerChan <-chan net.Conn | ||
listenerChan chan<- net.Conn | ||
ctx context.Context | ||
path string | ||
lockfile os.File | ||
lockfile *os.File | ||
state bitmask.Byte | ||
cancal func() | ||
} | ||
|
||
const ( | ||
STATE_UNDEFINED = 0 | ||
STATE_INITIALIZED = 1 << iota | ||
STATE_LOWERUP = 1 << iota | ||
STATE_UP = 1 << iota | ||
STATE_TAINT = 1 << iota | ||
) | ||
|
||
func ListenDS(ctx context.Context, path string) (*Listener, error) { | ||
|
||
vln := &Listener{path: path} | ||
vln := &Listener{path: path, state: STATE_INITIALIZED, ctx: ctx} | ||
return vln, nil | ||
} | ||
|
||
func (ls *Listener) Down() error { | ||
err := ls.ln.Close() | ||
if err != nil { | ||
newError(err).AtDebug().WriteToLog() | ||
var err error | ||
if !ls.state.Has(STATE_LOWERUP | STATE_UP) { | ||
err = newError(ls.state).Base(newError("Invalid State:Down")) | ||
if ___DEBUG_PANIC_WHEN_ENCOUNTED_IMPOSSIBLE_ERROR { | ||
panic(err) | ||
} | ||
return err | ||
} | ||
return err | ||
|
||
ls.cancal() | ||
closeerr := ls.ln.Close() | ||
var lockerr error | ||
if isUnixDomainSocketFileSystemBased(ls.path) { | ||
lockerr = giveupLock(ls.lockfile) | ||
} | ||
if closeerr != nil && lockerr != nil { | ||
if ___DEBUG_PANIC_WHEN_ERROR_UNPROPAGATEABLE { | ||
panic(closeerr.Error() + lockerr.Error()) | ||
} | ||
} | ||
|
||
if closeerr != nil { | ||
return newError("Cannot Close Unix domain socket listener").Base(closeerr) | ||
} | ||
if lockerr != nil { | ||
return newError("Cannot release lock for Unix domain socket listener").Base(lockerr) | ||
} | ||
ls.state.Clear(STATE_LOWERUP | STATE_UP) | ||
return nil | ||
} | ||
|
||
//Setup systen level Listener | ||
//LowerUP Setup systen level Listener | ||
func (ls *Listener) LowerUP() error { | ||
var err error | ||
|
||
if !ls.state.Has(STATE_INITIALIZED) || ls.state.Has(STATE_LOWERUP) { | ||
err = newError(ls.state).Base(newError("Invalid State:LowerUP")) | ||
if ___DEBUG_PANIC_WHEN_ENCOUNTED_IMPOSSIBLE_ERROR { | ||
panic(err) | ||
} | ||
return err | ||
} | ||
|
||
if isUnixDomainSocketFileSystemBased(ls.path) && !___DEBUG_IGNORE_FLOCK { | ||
ls.lockfile, err = acquireLock(ls.path + ".lock") | ||
if err != nil { | ||
newError(err).AtDebug().WriteToLog() | ||
return newError("Unable to acquire lock for filesystem based unix domain socket").Base(err) | ||
} | ||
} | ||
|
||
err = cleansePath(ls.path) | ||
if err != nil { | ||
return newError("Unable to cleanse path for the creation of unix domain socket").Base(err) | ||
} | ||
|
||
addr := new(net.UnixAddr) | ||
addr.Name = ls.path | ||
addr.Net = "unix" | ||
li, err := net.ListenUnix("unix", addr) | ||
ls.ln = li | ||
if err != nil { | ||
return newError("Unable to listen unix domain socket").Base(err) | ||
} | ||
|
||
ls.state.Set(STATE_LOWERUP) | ||
|
||
return nil | ||
} | ||
|
||
func (ls *Listener) UP(listener chan<- net.Conn, allowkick bool) error { | ||
var err error | ||
if !ls.state.Has(STATE_INITIALIZED|STATE_LOWERUP) || (ls.state.Has(STATE_UP) && !allowkick) { | ||
err = newError(ls.state).Base(newError("Invalid State:UP")) | ||
if ___DEBUG_PANIC_WHEN_ENCOUNTED_IMPOSSIBLE_ERROR { | ||
panic(err) | ||
} | ||
return err | ||
} | ||
ls.listenerChan = listener | ||
if ls.state.Has(STATE_UP) { | ||
cctx, cancel := context.WithCancel(ls.ctx) | ||
ls.cancal = cancel | ||
go ls.uploop(cctx) | ||
} | ||
return nil | ||
} | ||
|
||
func (ls *Listener) uploop(cctx context.Context) { | ||
var lasterror error | ||
errortolerance := 5 | ||
for { | ||
if cctx.Err() != nil { | ||
return | ||
} | ||
conn, err := ls.ln.Accept() | ||
|
||
if err != nil { | ||
newError("Cannot Accept socket from listener").Base(err).AtDebug().WriteToLog() | ||
if err == lasterror { | ||
errortolerance-- | ||
if errortolerance == 0 { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Guard against too many open file error There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please put this comment into source code. |
||
newError("unix domain socket melt down as the error is repeating").Base(err).AtError().WriteToLog() | ||
ls.cancal() | ||
} | ||
newError("unix domain socket listener is throttling accept as the error is repeating").Base(err).AtError().WriteToLog() | ||
time.Sleep(time.Second * 5) | ||
} | ||
lasterror = err | ||
} | ||
|
||
ls.listenerChan <- conn | ||
} | ||
} | ||
|
||
func isUnixDomainSocketFileSystemBased(path string) bool { | ||
//No Branching | ||
return path[0] != 0 | ||
} | ||
|
||
func AcquireLock(lockfilepath string) (*os.File, error) { | ||
func acquireLock(lockfilepath string) (*os.File, error) { | ||
f, err := os.Create(lockfilepath) | ||
if err != nil { | ||
newError(err).AtDebug().WriteToLog() | ||
|
@@ -69,6 +173,37 @@ func AcquireLock(lockfilepath string) (*os.File, error) { | |
} | ||
return nil, err | ||
} | ||
return nil, err | ||
} | ||
|
||
func giveupLock(locker *os.File) error { | ||
err := syscall.Flock(int(locker.Fd()), syscall.LOCK_UN) | ||
if err != nil { | ||
closeerr := locker.Close() | ||
if err != nil { | ||
if ___DEBUG_PANIC_WHEN_ERROR_UNPROPAGATEABLE { | ||
panic(closeerr) | ||
} | ||
newError(closeerr).AtDebug().WriteToLog() | ||
} | ||
newError(err).AtDebug().WriteToLog() | ||
return err | ||
} | ||
closeerr := locker.Close() | ||
if closeerr != nil { | ||
newError(closeerr).AtDebug().WriteToLog() | ||
return closeerr | ||
} | ||
return closeerr | ||
} | ||
|
||
func cleansePath(path string) error { | ||
_, err := os.Stat(path) | ||
if err == os.ErrNotExist { | ||
return nil | ||
} | ||
err = os.Remove(path) | ||
return err | ||
} | ||
|
||
//DEBUG CONSTS | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
https://gavv.github.io/blog/unix-socket-reuse/
There was a problem hiding this comment.
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.