docstring_tokens stringlengths 0 76.5k | code_tokens stringlengths 75 1.81M | label_window listlengths 4 2.12k | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|---|
github.com/gofrs/uuid/v5 v5.0.0 h1:p544++a97kEL+svbcFbCQVM9KFu0Yo25UoISXGNNH9M=
github.com/gofrs/uuid/v5 v5.0.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8= | <mask> github.com/go-chi/cors v1.2.1 h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4=
<mask> github.com/go-chi/cors v1.2.1/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58=
<mask> github.com/go-chi/render v1.0.2 h1:4ER/udB0+fMWB2Jlf15RV3F4A2FDuYi/9f+lFttR/Lg=
<mask> github.com/go-chi/render v1.0.2/go.mod h1:/gr3hVkmYR0YlEy3LxCuVRFzEu9Ruok+gFqbIofjao0=
<mask> github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA=
<mask> github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
<mask> github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
<mask> github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
<mask> github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
<mask> github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
<mask> github.com/insomniacslk/dhcp v0.0.0-20230307103557-e252950ab961 h1:x/YtdDlmypenG1te/FfH6LVM+3krhXk5CFV8VYNNX5M=
</s> Chore: update uuid to v5 </s> remove github.com/gofrs/uuid v4.4.0+incompatible
</s> add github.com/gofrs/uuid/v5 v5.0.0 </s> remove github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA=
github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
</s> add github.com/gofrs/uuid/v5 v5.0.0 h1:p544++a97kEL+svbcFbCQVM9KFu0Yo25UoISXGNNH9M=
github.com/gofrs/uuid/v5 v5.0.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8= </s> remove github.com/gofrs/uuid v4.4.0+incompatible // indirect
</s> add github.com/gofrs/uuid/v5 v5.0.0 // indirect </s> remove "github.com/gofrs/uuid"
</s> add "github.com/gofrs/uuid/v5" </s> remove "github.com/gofrs/uuid"
</s> add "github.com/gofrs/uuid/v5" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e5a2dbd9b5ec4bdb9449ebf596521db22f3fd86c | go.sum |
github.com/gofrs/uuid/v5 v5.0.0 // indirect | <mask> github.com/Microsoft/go-winio v0.5.2 // indirect
<mask> github.com/davecgh/go-spew v1.1.1 // indirect
<mask> github.com/docker/distribution v2.8.1+incompatible // indirect
<mask> github.com/docker/go-units v0.4.0 // indirect
<mask> github.com/gofrs/uuid v4.4.0+incompatible // indirect
<mask> github.com/gogo/protobuf v1.3.2 // indirect
<mask> github.com/google/go-cmp v0.5.9 // indirect
<mask> github.com/gorilla/websocket v1.5.0 // indirect
<mask> github.com/insomniacslk/dhcp v0.0.0-20230307103557-e252950ab961 // indirect
<mask> github.com/josharian/native v1.1.0 // indirect
</s> Chore: update uuid to v5 </s> remove "github.com/gofrs/uuid"
</s> add "github.com/gofrs/uuid/v5" </s> remove "github.com/gofrs/uuid"
</s> add "github.com/gofrs/uuid/v5" </s> remove github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA=
github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
</s> add github.com/gofrs/uuid/v5 v5.0.0 h1:p544++a97kEL+svbcFbCQVM9KFu0Yo25UoISXGNNH9M=
github.com/gofrs/uuid/v5 v5.0.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8= </s> remove github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA=
github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
</s> add github.com/gofrs/uuid/v5 v5.0.0 h1:p544++a97kEL+svbcFbCQVM9KFu0Yo25UoISXGNNH9M=
github.com/gofrs/uuid/v5 v5.0.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8= </s> remove github.com/gofrs/uuid v4.4.0+incompatible
</s> add github.com/gofrs/uuid/v5 v5.0.0 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e5a2dbd9b5ec4bdb9449ebf596521db22f3fd86c | test/go.mod |
github.com/gofrs/uuid/v5 v5.0.0 h1:p544++a97kEL+svbcFbCQVM9KFu0Yo25UoISXGNNH9M=
github.com/gofrs/uuid/v5 v5.0.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8= | <mask> github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
<mask> github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
<mask> github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw=
<mask> github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
<mask> github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA=
<mask> github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
<mask> github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
<mask> github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
<mask> github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
<mask> github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
<mask> github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
</s> Chore: update uuid to v5 </s> remove github.com/gofrs/uuid v4.4.0+incompatible // indirect
</s> add github.com/gofrs/uuid/v5 v5.0.0 // indirect </s> remove github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA=
github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
</s> add github.com/gofrs/uuid/v5 v5.0.0 h1:p544++a97kEL+svbcFbCQVM9KFu0Yo25UoISXGNNH9M=
github.com/gofrs/uuid/v5 v5.0.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8= </s> remove github.com/gofrs/uuid v4.4.0+incompatible
</s> add github.com/gofrs/uuid/v5 v5.0.0 </s> remove "github.com/gofrs/uuid"
</s> add "github.com/gofrs/uuid/v5" </s> remove "github.com/gofrs/uuid"
</s> add "github.com/gofrs/uuid/v5" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e5a2dbd9b5ec4bdb9449ebf596521db22f3fd86c | test/go.sum |
"github.com/gofrs/uuid/v5" | <mask> import (
<mask> "bytes"
<mask> "crypto/md5"
<mask>
<mask> "github.com/gofrs/uuid"
<mask> )
<mask>
<mask> // ID cmdKey length
<mask> const (
<mask> IDBytesLen = 16
</s> Chore: update uuid to v5 </s> remove "github.com/gofrs/uuid"
</s> add "github.com/gofrs/uuid/v5" </s> remove "github.com/gofrs/uuid"
</s> add "github.com/gofrs/uuid/v5" </s> remove "github.com/gofrs/uuid"
</s> add "github.com/gofrs/uuid/v5" </s> remove github.com/gofrs/uuid v4.4.0+incompatible // indirect
</s> add github.com/gofrs/uuid/v5 v5.0.0 // indirect </s> remove github.com/gofrs/uuid v4.4.0+incompatible
</s> add github.com/gofrs/uuid/v5 v5.0.0 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e5a2dbd9b5ec4bdb9449ebf596521db22f3fd86c | transport/vmess/user.go |
"github.com/gofrs/uuid/v5" | <mask> "math/rand"
<mask> "net"
<mask> "runtime"
<mask>
<mask> "github.com/gofrs/uuid"
<mask> )
<mask>
<mask> // Version of vmess
<mask> const Version byte = 1
<mask>
</s> Chore: update uuid to v5 </s> remove "github.com/gofrs/uuid"
</s> add "github.com/gofrs/uuid/v5" </s> remove "github.com/gofrs/uuid"
</s> add "github.com/gofrs/uuid/v5" </s> remove github.com/gofrs/uuid v4.4.0+incompatible // indirect
</s> add github.com/gofrs/uuid/v5 v5.0.0 // indirect </s> remove "github.com/gofrs/uuid"
</s> add "github.com/gofrs/uuid/v5" </s> remove "github.com/gofrs/uuid"
</s> add "github.com/gofrs/uuid/v5" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e5a2dbd9b5ec4bdb9449ebf596521db22f3fd86c | transport/vmess/vmess.go |
"github.com/gofrs/uuid/v5" | <mask> "time"
<mask>
<mask> C "github.com/Dreamacro/clash/constant"
<mask>
<mask> "github.com/gofrs/uuid"
<mask> "go.uber.org/atomic"
<mask> )
<mask>
<mask> type tracker interface {
<mask> ID() string
</s> Chore: update uuid to v5 </s> remove "github.com/gofrs/uuid"
</s> add "github.com/gofrs/uuid/v5" </s> remove "github.com/gofrs/uuid"
</s> add "github.com/gofrs/uuid/v5" </s> remove "github.com/gofrs/uuid"
</s> add "github.com/gofrs/uuid/v5" </s> remove "github.com/gofrs/uuid"
</s> add "github.com/gofrs/uuid/v5" </s> remove "github.com/gofrs/uuid"
</s> add "github.com/gofrs/uuid/v5" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e5a2dbd9b5ec4bdb9449ebf596521db22f3fd86c | tunnel/statistic/tracker.go |
Interface string `proxy:"interface-name,omitempty" group:"interface-name,omitempty"` | <mask> return opts
<mask> }
<mask>
<mask> type BasicOption struct {
<mask> Interface string `proxy:"interface-name"`
<mask> }
<mask>
<mask> type BaseOption struct {
<mask> Name string
<mask> Addr string
</s> Fix: parse dial interface option </s> remove if err != nil {
t.Fatal(err.Error())
</s> add assert.Nil(t, err)
assert.Equal(t, goal, s)
}
func TestStructure_Nest(t *testing.T) {
rawMap := map[string]interface{}{
"foo": 1, </s> remove if err != nil {
t.Fatal(err.Error())
}
if !reflect.DeepEqual(s, goal) {
t.Fatalf("bad: %#v", s)
}
</s> add assert.Nil(t, err)
assert.Equal(t, goal, s) </s> remove if err != nil {
t.Fatal(err.Error())
}
if !reflect.DeepEqual(s, goal) {
t.Fatalf("bad: %#v", s)
}
</s> add assert.Nil(t, err)
assert.Equal(t, goal, s) </s> remove if err != nil {
t.Fatal(err.Error())
}
if !reflect.DeepEqual(s, goal) {
t.Fatalf("bad: %#v", s)
}
</s> add assert.Nil(t, err)
assert.Equal(t, goal, s) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e622d8dd38086f96c49726f4d6572135ce9847f6 | adapter/outbound/base.go |
if field.Anonymous {
if err := d.decodeStruct(field.Name, src, v.Field(idx)); err != nil {
return err
}
continue
} | <mask> v := reflect.ValueOf(dst).Elem()
<mask> for idx := 0; idx < v.NumField(); idx++ {
<mask> field := t.Field(idx)
<mask>
<mask> tag := field.Tag.Get(d.option.TagName)
<mask> str := strings.SplitN(tag, ",", 2)
<mask> key := str[0]
</s> Fix: parse dial interface option </s> remove if err == nil {
t.Fatalf("should throw error: %#v", s)
}
</s> add assert.NotNilf(t, err, "should throw error: %#v", s) </s> remove if err == nil {
t.Fatalf("should throw error: %#v", s)
}
</s> add assert.NotNilf(t, err, "should throw error: %#v", s) </s> remove if err != nil {
t.Fatal(err.Error())
}
if !reflect.DeepEqual(s, goal) {
t.Fatalf("bad: %#v", s)
}
</s> add assert.Nil(t, err)
assert.Equal(t, goal, s) </s> remove if err != nil {
t.Fatal(err.Error())
}
if !reflect.DeepEqual(s, goal) {
t.Fatalf("bad: %#v", s)
}
</s> add assert.Nil(t, err)
assert.Equal(t, goal, s) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e622d8dd38086f96c49726f4d6572135ce9847f6 | common/structure/structure.go |
<mask> package structure
<mask>
<mask> import (
<mask> "reflect"
<mask> "testing"
<mask> )
<mask>
<mask> var (
<mask> decoder = NewDecoder(Option{TagName: "test"})
</s> Fix: parse dial interface option </s> remove if !reflect.DeepEqual(s, goal) {
t.Fatalf("bad: %#v", s)
</s> add goal := BazOptional{
Foo: 1, </s> remove if err != nil {
t.Fatal(err.Error())
</s> add assert.Nil(t, err)
assert.Equal(t, goal, s)
}
func TestStructure_Nest(t *testing.T) {
rawMap := map[string]interface{}{
"foo": 1, </s> remove if err == nil {
t.Fatalf("should throw error: %#v", s)
}
</s> add assert.NotNilf(t, err, "should throw error: %#v", s) | [
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e622d8dd38086f96c49726f4d6572135ce9847f6 | common/structure/structure_test.go | |
"github.com/stretchr/testify/assert" | <mask> import (
<mask> "testing"
<mask> )
<mask>
<mask> var (
<mask> decoder = NewDecoder(Option{TagName: "test"})
<mask> weakTypeDecoder = NewDecoder(Option{TagName: "test", WeaklyTypedInput: true})
<mask> )
</s> Fix: parse dial interface option </s> remove "reflect"
</s> add </s> remove if !reflect.DeepEqual(s, goal) {
t.Fatalf("bad: %#v", s)
</s> add goal := BazOptional{
Foo: 1, </s> remove if err != nil {
t.Fatal(err.Error())
</s> add assert.Nil(t, err)
assert.Equal(t, goal, s)
}
func TestStructure_Nest(t *testing.T) {
rawMap := map[string]interface{}{
"foo": 1, </s> remove if err == nil {
t.Fatalf("should throw error: %#v", s)
}
</s> add assert.NotNilf(t, err, "should throw error: %#v", s) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e622d8dd38086f96c49726f4d6572135ce9847f6 | common/structure/structure_test.go |
assert.Nil(t, err)
assert.Equal(t, goal, s) | <mask> }
<mask>
<mask> s := &Baz{}
<mask> err := decoder.Decode(rawMap, s)
<mask> if err != nil {
<mask> t.Fatal(err.Error())
<mask> }
<mask> if !reflect.DeepEqual(s, goal) {
<mask> t.Fatalf("bad: %#v", s)
<mask> }
<mask> }
<mask>
<mask> func TestStructure_Slice(t *testing.T) {
<mask> rawMap := map[string]interface{}{
<mask> "foo": 1,
</s> Fix: parse dial interface option </s> remove if err != nil {
t.Fatal(err.Error())
}
if !reflect.DeepEqual(s, goal) {
t.Fatalf("bad: %#v", s)
}
</s> add assert.Nil(t, err)
assert.Equal(t, goal, s) </s> remove if err != nil {
t.Fatal(err.Error())
}
if !reflect.DeepEqual(s, goal) {
t.Fatalf("bad: %#v", s)
}
</s> add assert.Nil(t, err)
assert.Equal(t, goal, s) </s> remove if err != nil {
t.Fatal(err.Error())
</s> add assert.Nil(t, err)
assert.Equal(t, goal, s)
}
func TestStructure_Nest(t *testing.T) {
rawMap := map[string]interface{}{
"foo": 1, </s> remove if err == nil {
t.Fatalf("should throw error: %#v", s)
}
</s> add assert.NotNilf(t, err, "should throw error: %#v", s) </s> remove if !reflect.DeepEqual(s, goal) {
t.Fatalf("bad: %#v", s)
</s> add goal := BazOptional{
Foo: 1, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e622d8dd38086f96c49726f4d6572135ce9847f6 | common/structure/structure_test.go |
assert.Nil(t, err)
assert.Equal(t, goal, s) | <mask> }
<mask>
<mask> s := &BazSlice{}
<mask> err := decoder.Decode(rawMap, s)
<mask> if err != nil {
<mask> t.Fatal(err.Error())
<mask> }
<mask> if !reflect.DeepEqual(s, goal) {
<mask> t.Fatalf("bad: %#v", s)
<mask> }
<mask> }
<mask>
<mask> func TestStructure_Optional(t *testing.T) {
<mask> rawMap := map[string]interface{}{
<mask> "foo": 1,
</s> Fix: parse dial interface option </s> remove if err != nil {
t.Fatal(err.Error())
</s> add assert.Nil(t, err)
assert.Equal(t, goal, s)
}
func TestStructure_Nest(t *testing.T) {
rawMap := map[string]interface{}{
"foo": 1, </s> remove if err != nil {
t.Fatal(err.Error())
}
if !reflect.DeepEqual(s, goal) {
t.Fatalf("bad: %#v", s)
}
</s> add assert.Nil(t, err)
assert.Equal(t, goal, s) </s> remove if err != nil {
t.Fatal(err.Error())
}
if !reflect.DeepEqual(s, goal) {
t.Fatalf("bad: %#v", s)
}
</s> add assert.Nil(t, err)
assert.Equal(t, goal, s) </s> remove if err == nil {
t.Fatalf("should throw error: %#v", s)
}
</s> add assert.NotNilf(t, err, "should throw error: %#v", s) </s> remove if !reflect.DeepEqual(s, goal) {
t.Fatalf("bad: %#v", s)
</s> add goal := BazOptional{
Foo: 1, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e622d8dd38086f96c49726f4d6572135ce9847f6 | common/structure/structure_test.go |
assert.Nil(t, err)
assert.Equal(t, goal, s) | <mask> }
<mask>
<mask> s := &BazOptional{}
<mask> err := decoder.Decode(rawMap, s)
<mask> if err != nil {
<mask> t.Fatal(err.Error())
<mask> }
<mask> if !reflect.DeepEqual(s, goal) {
<mask> t.Fatalf("bad: %#v", s)
<mask> }
<mask> }
<mask>
<mask> func TestStructure_MissingKey(t *testing.T) {
<mask> rawMap := map[string]interface{}{
<mask> "foo": 1,
</s> Fix: parse dial interface option </s> remove if err != nil {
t.Fatal(err.Error())
}
if !reflect.DeepEqual(s, goal) {
t.Fatalf("bad: %#v", s)
}
</s> add assert.Nil(t, err)
assert.Equal(t, goal, s) </s> remove if err != nil {
t.Fatal(err.Error())
}
if !reflect.DeepEqual(s, goal) {
t.Fatalf("bad: %#v", s)
}
</s> add assert.Nil(t, err)
assert.Equal(t, goal, s) </s> remove if err != nil {
t.Fatal(err.Error())
</s> add assert.Nil(t, err)
assert.Equal(t, goal, s)
}
func TestStructure_Nest(t *testing.T) {
rawMap := map[string]interface{}{
"foo": 1, </s> remove if !reflect.DeepEqual(s, goal) {
t.Fatalf("bad: %#v", s)
</s> add goal := BazOptional{
Foo: 1, </s> remove if err == nil {
t.Fatalf("should throw error: %#v", s)
}
</s> add assert.NotNilf(t, err, "should throw error: %#v", s) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e622d8dd38086f96c49726f4d6572135ce9847f6 | common/structure/structure_test.go |
assert.NotNilf(t, err, "should throw error: %#v", s) | <mask> }
<mask>
<mask> s := &Baz{}
<mask> err := decoder.Decode(rawMap, s)
<mask> if err == nil {
<mask> t.Fatalf("should throw error: %#v", s)
<mask> }
<mask> }
<mask>
<mask> func TestStructure_ParamError(t *testing.T) {
<mask> rawMap := map[string]interface{}{}
<mask> s := Baz{}
</s> Fix: parse dial interface option </s> remove if err == nil {
t.Fatalf("should throw error: %#v", s)
}
</s> add assert.NotNilf(t, err, "should throw error: %#v", s) </s> remove if err == nil {
t.Fatalf("should throw error: %#v", s)
}
</s> add assert.NotNilf(t, err, "should throw error: %#v", s) </s> remove if err != nil {
t.Fatal(err.Error())
}
if !reflect.DeepEqual(s, goal) {
t.Fatalf("bad: %#v", s)
}
</s> add assert.Nil(t, err)
assert.Equal(t, goal, s) </s> remove if err != nil {
t.Fatal(err.Error())
}
if !reflect.DeepEqual(s, goal) {
t.Fatalf("bad: %#v", s)
}
</s> add assert.Nil(t, err)
assert.Equal(t, goal, s) </s> remove if err != nil {
t.Fatal(err.Error())
}
if !reflect.DeepEqual(s, goal) {
t.Fatalf("bad: %#v", s)
}
</s> add assert.Nil(t, err)
assert.Equal(t, goal, s) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e622d8dd38086f96c49726f4d6572135ce9847f6 | common/structure/structure_test.go |
assert.NotNilf(t, err, "should throw error: %#v", s) | <mask> func TestStructure_ParamError(t *testing.T) {
<mask> rawMap := map[string]interface{}{}
<mask> s := Baz{}
<mask> err := decoder.Decode(rawMap, s)
<mask> if err == nil {
<mask> t.Fatalf("should throw error: %#v", s)
<mask> }
<mask> }
<mask>
<mask> func TestStructure_SliceTypeError(t *testing.T) {
<mask> rawMap := map[string]interface{}{
<mask> "foo": 1,
</s> Fix: parse dial interface option </s> remove if err == nil {
t.Fatalf("should throw error: %#v", s)
}
</s> add assert.NotNilf(t, err, "should throw error: %#v", s) </s> remove if err == nil {
t.Fatalf("should throw error: %#v", s)
}
</s> add assert.NotNilf(t, err, "should throw error: %#v", s) </s> remove if err != nil {
t.Fatal(err.Error())
}
if !reflect.DeepEqual(s, goal) {
t.Fatalf("bad: %#v", s)
}
</s> add assert.Nil(t, err)
assert.Equal(t, goal, s) </s> remove if err != nil {
t.Fatal(err.Error())
}
if !reflect.DeepEqual(s, goal) {
t.Fatalf("bad: %#v", s)
}
</s> add assert.Nil(t, err)
assert.Equal(t, goal, s) </s> remove if err != nil {
t.Fatal(err.Error())
}
if !reflect.DeepEqual(s, goal) {
t.Fatalf("bad: %#v", s)
}
</s> add assert.Nil(t, err)
assert.Equal(t, goal, s) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e622d8dd38086f96c49726f4d6572135ce9847f6 | common/structure/structure_test.go |
assert.NotNilf(t, err, "should throw error: %#v", s) | <mask> }
<mask>
<mask> s := &BazSlice{}
<mask> err := decoder.Decode(rawMap, s)
<mask> if err == nil {
<mask> t.Fatalf("should throw error: %#v", s)
<mask> }
<mask> }
<mask>
<mask> func TestStructure_WeakType(t *testing.T) {
<mask> rawMap := map[string]interface{}{
<mask> "foo": "1",
</s> Fix: parse dial interface option </s> remove if err == nil {
t.Fatalf("should throw error: %#v", s)
}
</s> add assert.NotNilf(t, err, "should throw error: %#v", s) </s> remove if err == nil {
t.Fatalf("should throw error: %#v", s)
}
</s> add assert.NotNilf(t, err, "should throw error: %#v", s) </s> remove if err != nil {
t.Fatal(err.Error())
}
if !reflect.DeepEqual(s, goal) {
t.Fatalf("bad: %#v", s)
}
</s> add assert.Nil(t, err)
assert.Equal(t, goal, s) </s> remove if err != nil {
t.Fatal(err.Error())
</s> add assert.Nil(t, err)
assert.Equal(t, goal, s)
}
func TestStructure_Nest(t *testing.T) {
rawMap := map[string]interface{}{
"foo": 1, </s> remove if err != nil {
t.Fatal(err.Error())
}
if !reflect.DeepEqual(s, goal) {
t.Fatalf("bad: %#v", s)
}
</s> add assert.Nil(t, err)
assert.Equal(t, goal, s) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e622d8dd38086f96c49726f4d6572135ce9847f6 | common/structure/structure_test.go |
assert.Nil(t, err)
assert.Equal(t, goal, s)
}
func TestStructure_Nest(t *testing.T) {
rawMap := map[string]interface{}{
"foo": 1, | <mask> }
<mask>
<mask> s := &BazSlice{}
<mask> err := weakTypeDecoder.Decode(rawMap, s)
<mask> if err != nil {
<mask> t.Fatal(err.Error())
<mask> }
<mask> if !reflect.DeepEqual(s, goal) {
<mask> t.Fatalf("bad: %#v", s)
<mask> }
<mask> }
</s> Fix: parse dial interface option </s> remove if !reflect.DeepEqual(s, goal) {
t.Fatalf("bad: %#v", s)
</s> add goal := BazOptional{
Foo: 1, </s> remove if err != nil {
t.Fatal(err.Error())
}
if !reflect.DeepEqual(s, goal) {
t.Fatalf("bad: %#v", s)
}
</s> add assert.Nil(t, err)
assert.Equal(t, goal, s) </s> remove if err != nil {
t.Fatal(err.Error())
}
if !reflect.DeepEqual(s, goal) {
t.Fatalf("bad: %#v", s)
}
</s> add assert.Nil(t, err)
assert.Equal(t, goal, s) </s> remove if err != nil {
t.Fatal(err.Error())
}
if !reflect.DeepEqual(s, goal) {
t.Fatalf("bad: %#v", s)
}
</s> add assert.Nil(t, err)
assert.Equal(t, goal, s) </s> remove if err == nil {
t.Fatalf("should throw error: %#v", s)
}
</s> add assert.NotNilf(t, err, "should throw error: %#v", s) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e622d8dd38086f96c49726f4d6572135ce9847f6 | common/structure/structure_test.go |
goal := BazOptional{
Foo: 1, | <mask> err := weakTypeDecoder.Decode(rawMap, s)
<mask> if err != nil {
<mask> t.Fatal(err.Error())
<mask> }
<mask> if !reflect.DeepEqual(s, goal) {
<mask> t.Fatalf("bad: %#v", s)
<mask> }
<mask> }
</s> Fix: parse dial interface option </s> remove if err != nil {
t.Fatal(err.Error())
</s> add assert.Nil(t, err)
assert.Equal(t, goal, s)
}
func TestStructure_Nest(t *testing.T) {
rawMap := map[string]interface{}{
"foo": 1, </s> remove if err != nil {
t.Fatal(err.Error())
}
if !reflect.DeepEqual(s, goal) {
t.Fatalf("bad: %#v", s)
}
</s> add assert.Nil(t, err)
assert.Equal(t, goal, s) </s> remove if err != nil {
t.Fatal(err.Error())
}
if !reflect.DeepEqual(s, goal) {
t.Fatalf("bad: %#v", s)
}
</s> add assert.Nil(t, err)
assert.Equal(t, goal, s) </s> remove if err != nil {
t.Fatal(err.Error())
}
if !reflect.DeepEqual(s, goal) {
t.Fatalf("bad: %#v", s)
}
</s> add assert.Nil(t, err)
assert.Equal(t, goal, s) </s> remove if err == nil {
t.Fatalf("should throw error: %#v", s)
}
</s> add assert.NotNilf(t, err, "should throw error: %#v", s) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e622d8dd38086f96c49726f4d6572135ce9847f6 | common/structure/structure_test.go |
s := &struct {
BazOptional
}{}
err := decoder.Decode(rawMap, s)
assert.Nil(t, err)
assert.Equal(t, s.BazOptional, goal) | <mask>
<mask> goal := BazOptional{
<mask> Foo: 1,
<mask> }
<mask> }
</s> Fix: parse dial interface option </s> remove if !reflect.DeepEqual(s, goal) {
t.Fatalf("bad: %#v", s)
</s> add goal := BazOptional{
Foo: 1, </s> remove if err != nil {
t.Fatal(err.Error())
</s> add assert.Nil(t, err)
assert.Equal(t, goal, s)
}
func TestStructure_Nest(t *testing.T) {
rawMap := map[string]interface{}{
"foo": 1, </s> remove if err != nil {
t.Fatal(err.Error())
}
if !reflect.DeepEqual(s, goal) {
t.Fatalf("bad: %#v", s)
}
</s> add assert.Nil(t, err)
assert.Equal(t, goal, s) </s> remove if err != nil {
t.Fatal(err.Error())
}
if !reflect.DeepEqual(s, goal) {
t.Fatalf("bad: %#v", s)
}
</s> add assert.Nil(t, err)
assert.Equal(t, goal, s) </s> remove if err != nil {
t.Fatal(err.Error())
}
if !reflect.DeepEqual(s, goal) {
t.Fatalf("bad: %#v", s)
}
</s> add assert.Nil(t, err)
assert.Equal(t, goal, s) | [
"keep",
"keep",
"keep",
"add",
"keep"
] | https://github.com/Dreamacro/clash/commit/e622d8dd38086f96c49726f4d6572135ce9847f6 | common/structure/structure_test.go |
// The return of this function will not wait for the cancel of context. | <mask> }
<mask>
<mask> // WaitWithoutCancel blocks until the first result return, if timeout will return nil.
<mask> func (p *Picker) WaitWithoutCancel() interface{} {
<mask> select {
<mask> case <-p.firstDone:
<mask> return p.result
</s> Fix: upstream dns ExchangeContext workaround (#468) </s> remove elm := fast.Wait()
</s> add elm := fast.WaitWithoutCancel() </s> remove fast, ctx := picker.WithTimeout(context.Background(), time.Second * 5)
</s> add fast, ctx := picker.WithTimeout(context.Background(), time.Second*5) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e68c0d088b412bb4211997f21f964a6fd65b4c70 | common/picker/picker.go |
// Please note that miekg/dns ExchangeContext doesn't respond to context cancel. | <mask>
<mask> func (c *client) ExchangeContext(ctx context.Context, m *D.Msg) (msg *D.Msg, err error) {
<mask> msg, _, err = c.Client.ExchangeContext(ctx, m, c.Address)
<mask> return
<mask> }
</s> Fix: upstream dns ExchangeContext workaround (#468) </s> remove fast, ctx := picker.WithTimeout(context.Background(), time.Second * 5)
</s> add fast, ctx := picker.WithTimeout(context.Background(), time.Second*5) </s> remove elm := fast.Wait()
</s> add elm := fast.WaitWithoutCancel() | [
"keep",
"add",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e68c0d088b412bb4211997f21f964a6fd65b4c70 | dns/client.go |
fast, ctx := picker.WithTimeout(context.Background(), time.Second*5) | <mask> return false
<mask> }
<mask>
<mask> func (r *Resolver) batchExchange(clients []resolver, m *D.Msg) (msg *D.Msg, err error) {
<mask> fast, ctx := picker.WithTimeout(context.Background(), time.Second * 5)
<mask> for _, client := range clients {
<mask> r := client
<mask> fast.Go(func() (interface{}, error) {
<mask> msg, err := r.ExchangeContext(ctx, m)
<mask> if err != nil || msg.Rcode != D.RcodeSuccess {
</s> Fix: upstream dns ExchangeContext workaround (#468) </s> remove elm := fast.Wait()
</s> add elm := fast.WaitWithoutCancel() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e68c0d088b412bb4211997f21f964a6fd65b4c70 | dns/resolver.go |
elm := fast.WaitWithoutCancel() | <mask> return msg, nil
<mask> })
<mask> }
<mask>
<mask> elm := fast.Wait()
<mask> if elm == nil {
<mask> return nil, errors.New("All DNS requests failed")
<mask> }
<mask>
<mask> msg = elm.(*D.Msg)
</s> Fix: upstream dns ExchangeContext workaround (#468) </s> remove fast, ctx := picker.WithTimeout(context.Background(), time.Second * 5)
</s> add fast, ctx := picker.WithTimeout(context.Background(), time.Second*5) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e68c0d088b412bb4211997f21f964a6fd65b4c70 | dns/resolver.go |
Timeout: 5 * time.Second, | <mask> },
<mask> UDPSize: 4096,
<mask> },
<mask> Address: s.Addr,
<mask> })
<mask> }
<mask> return ret
</s> Fix: upstream dns ExchangeContext workaround (#468) </s> remove elm := fast.Wait()
</s> add elm := fast.WaitWithoutCancel() </s> remove fast, ctx := picker.WithTimeout(context.Background(), time.Second * 5)
</s> add fast, ctx := picker.WithTimeout(context.Background(), time.Second*5) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e68c0d088b412bb4211997f21f964a6fd65b4c70 | dns/util.go |
"sync" | <mask> "strconv"
<mask> "strings"
<mask> "syscall"
<mask> "unsafe"
<mask>
<mask> "github.com/Dreamacro/clash/common/cache"
</s> Fix: PROCESS-NAME on FreeBSD 11.x (#947) </s> remove isIPv4 := ip.To4() != nil
</s> add </s> remove var processCache = cache.NewLRUCache(cache.WithAge(2), cache.WithSize(64))
</s> add var (
processCache = cache.NewLRUCache(cache.WithAge(2), cache.WithSize(64))
errNotFound = errors.New("process not found")
matchMeta = func(p *Process, m *C.Metadata) bool { return false }
defaultSearcher *searcher
once sync.Once
) </s> remove func (ps *Process) Match(metadata *C.Metadata) bool {
</s> add func match(ps *Process, metadata *C.Metadata) bool { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e773f95f219ece9c382ac372273a9f3a7d60eb1a | rules/process_freebsd_amd64.go |
var (
processCache = cache.NewLRUCache(cache.WithAge(2), cache.WithSize(64))
errNotFound = errors.New("process not found")
matchMeta = func(p *Process, m *C.Metadata) bool { return false }
defaultSearcher *searcher
once sync.Once
) | <mask> "github.com/Dreamacro/clash/log"
<mask> )
<mask>
<mask> // store process name for when dealing with multiple PROCESS-NAME rules
<mask> var processCache = cache.NewLRUCache(cache.WithAge(2), cache.WithSize(64))
<mask>
<mask> type Process struct {
<mask> adapter string
<mask> process string
<mask> }
</s> Fix: PROCESS-NAME on FreeBSD 11.x (#947) </s> remove var itemSize int
var inpOffset int
</s> add var isTCP bool </s> remove // skip the first xinpgen(64 bytes) block
for i := 64; i+itemSize <= len(buf); i += itemSize {
</s> add pid, err := defaultSearcher.Search(buf, ip, uint16(port), isTCP)
if err != nil {
return "", err
}
return getExecPathFromPID(pid)
}
func readNativeUint32(b []byte) uint32 {
return *(*uint32)(unsafe.Pointer(&b[0]))
}
type searcher struct {
// sizeof(struct xinpgen)
headSize int
// sizeof(struct xtcpcb)
tcpItemSize int
// sizeof(struct xinpcb)
udpItemSize int
udpInpOffset int
port int
ip int
vflag int
socket int
// sizeof(struct xfile)
fileItemSize int
data int
pid int
}
func (s *searcher) Search(buf []byte, ip net.IP, port uint16, isTCP bool) (uint32, error) {
var itemSize int
var inpOffset int
if isTCP {
// struct xtcpcb
itemSize = s.tcpItemSize
inpOffset = 8
} else {
// struct xinpcb
itemSize = s.udpItemSize
inpOffset = s.udpInpOffset
}
isIPv4 := ip.To4() != nil
// skip the first xinpgen block
for i := s.headSize; i+itemSize <= len(buf); i += itemSize { </s> remove // struct xtcpcb
itemSize = 744
inpOffset = 8
</s> add isTCP = true | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e773f95f219ece9c382ac372273a9f3a7d60eb1a | rules/process_freebsd_amd64.go |
func match(ps *Process, metadata *C.Metadata) bool { | <mask> func (ps *Process) RuleType() C.RuleType {
<mask> return C.Process
<mask> }
<mask>
<mask> func (ps *Process) Match(metadata *C.Metadata) bool {
<mask> key := fmt.Sprintf("%s:%s:%s", metadata.NetWork.String(), metadata.SrcIP.String(), metadata.SrcPort)
<mask> cached, hit := processCache.Get(key)
<mask> if !hit {
<mask> name, err := getExecPathFromAddress(metadata)
<mask> if err != nil {
</s> Fix: PROCESS-NAME on FreeBSD 11.x (#947) </s> remove func searchSocketPid(socket uint64) (uint32, error) {
value, err := syscall.Sysctl("kern.file")
if err != nil {
return 0, err
}
buf := []byte(value)
// struct xfile
itemSize := 128
for i := 0; i+itemSize <= len(buf); i += itemSize {
// xfile.xf_data
data := binary.BigEndian.Uint64(buf[i+56 : i+64])
if data == socket {
// xfile.xf_pid
pid := readNativeUint32(buf[i+8 : i+12])
return pid, nil
}
}
return 0, errors.New("pid not found")
}
</s> add </s> remove func readNativeUint32(b []byte) uint32 {
return *(*uint32)(unsafe.Pointer(&b[0]))
</s> add func initSearcher() error {
osRelease, err := syscall.Sysctl("kern.osrelease")
if err != nil {
return err
}
dot := strings.Index(osRelease, ".")
if dot != -1 {
osRelease = osRelease[:dot]
}
major, err := strconv.Atoi(osRelease)
if err != nil {
return err
}
defaultSearcher = newSearcher(major)
if defaultSearcher == nil {
return fmt.Errorf("unsupported freebsd version %d", major)
}
return nil </s> remove socket := binary.BigEndian.Uint64(buf[inp+16 : inp+24])
pid, err := searchSocketPid(socket)
if err != nil {
return "", err
</s> add socket := binary.BigEndian.Uint64(buf[inp+s.socket : inp+s.socket+8])
return s.searchSocketPid(socket)
}
return 0, errNotFound
}
func (s *searcher) searchSocketPid(socket uint64) (uint32, error) {
value, err := syscall.Sysctl("kern.file")
if err != nil {
return 0, err
}
buf := []byte(value)
// struct xfile
itemSize := s.fileItemSize
for i := 0; i+itemSize <= len(buf); i += itemSize {
// xfile.xf_data
data := binary.BigEndian.Uint64(buf[i+s.data : i+s.data+8])
if data == socket {
// xfile.xf_pid
pid := readNativeUint32(buf[i+s.pid : i+s.pid+4])
return pid, nil </s> remove isIPv4 := ip.To4() != nil
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e773f95f219ece9c382ac372273a9f3a7d60eb1a | rules/process_freebsd_amd64.go |
func (ps *Process) Match(metadata *C.Metadata) bool {
return matchMeta(ps, metadata)
}
| <mask> return strings.EqualFold(cached.(string), ps.process)
<mask> }
<mask>
<mask> func (p *Process) Adapter() string {
<mask> return p.adapter
<mask> }
<mask>
</s> Fix: PROCESS-NAME on FreeBSD 11.x (#947) </s> remove func (ps *Process) Match(metadata *C.Metadata) bool {
</s> add func match(ps *Process, metadata *C.Metadata) bool { </s> remove var processCache = cache.NewLRUCache(cache.WithAge(2), cache.WithSize(64))
</s> add var (
processCache = cache.NewLRUCache(cache.WithAge(2), cache.WithSize(64))
errNotFound = errors.New("process not found")
matchMeta = func(p *Process, m *C.Metadata) bool { return false }
defaultSearcher *searcher
once sync.Once
) </s> remove func readNativeUint32(b []byte) uint32 {
return *(*uint32)(unsafe.Pointer(&b[0]))
</s> add func initSearcher() error {
osRelease, err := syscall.Sysctl("kern.osrelease")
if err != nil {
return err
}
dot := strings.Index(osRelease, ".")
if dot != -1 {
osRelease = osRelease[:dot]
}
major, err := strconv.Atoi(osRelease)
if err != nil {
return err
}
defaultSearcher = newSearcher(major)
if defaultSearcher == nil {
return fmt.Errorf("unsupported freebsd version %d", major)
}
return nil </s> remove var itemSize int
var inpOffset int
</s> add var isTCP bool | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e773f95f219ece9c382ac372273a9f3a7d60eb1a | rules/process_freebsd_amd64.go |
once.Do(func() {
err := initSearcher()
if err != nil {
log.Errorln("Initialize PROCESS-NAME failed: %s", err.Error())
log.Warnln("All PROCESS-NAME rules will be skipped")
return
}
matchMeta = match
}) | <mask> }
<mask>
<mask> func NewProcess(process string, adapter string) (*Process, error) {
<mask> return &Process{
<mask> adapter: adapter,
<mask> process: process,
<mask> }, nil
<mask> }
</s> Fix: PROCESS-NAME on FreeBSD 11.x (#947) </s> remove func searchSocketPid(socket uint64) (uint32, error) {
value, err := syscall.Sysctl("kern.file")
if err != nil {
return 0, err
}
buf := []byte(value)
// struct xfile
itemSize := 128
for i := 0; i+itemSize <= len(buf); i += itemSize {
// xfile.xf_data
data := binary.BigEndian.Uint64(buf[i+56 : i+64])
if data == socket {
// xfile.xf_pid
pid := readNativeUint32(buf[i+8 : i+12])
return pid, nil
}
}
return 0, errors.New("pid not found")
}
</s> add </s> remove func readNativeUint32(b []byte) uint32 {
return *(*uint32)(unsafe.Pointer(&b[0]))
</s> add func initSearcher() error {
osRelease, err := syscall.Sysctl("kern.osrelease")
if err != nil {
return err
}
dot := strings.Index(osRelease, ".")
if dot != -1 {
osRelease = osRelease[:dot]
}
major, err := strconv.Atoi(osRelease)
if err != nil {
return err
}
defaultSearcher = newSearcher(major)
if defaultSearcher == nil {
return fmt.Errorf("unsupported freebsd version %d", major)
}
return nil </s> remove socket := binary.BigEndian.Uint64(buf[inp+16 : inp+24])
pid, err := searchSocketPid(socket)
if err != nil {
return "", err
</s> add socket := binary.BigEndian.Uint64(buf[inp+s.socket : inp+s.socket+8])
return s.searchSocketPid(socket)
}
return 0, errNotFound
}
func (s *searcher) searchSocketPid(socket uint64) (uint32, error) {
value, err := syscall.Sysctl("kern.file")
if err != nil {
return 0, err
}
buf := []byte(value)
// struct xfile
itemSize := s.fileItemSize
for i := 0; i+itemSize <= len(buf); i += itemSize {
// xfile.xf_data
data := binary.BigEndian.Uint64(buf[i+s.data : i+s.data+8])
if data == socket {
// xfile.xf_pid
pid := readNativeUint32(buf[i+s.pid : i+s.pid+4])
return pid, nil </s> remove var processCache = cache.NewLRUCache(cache.WithAge(2), cache.WithSize(64))
</s> add var (
processCache = cache.NewLRUCache(cache.WithAge(2), cache.WithSize(64))
errNotFound = errors.New("process not found")
matchMeta = func(p *Process, m *C.Metadata) bool { return false }
defaultSearcher *searcher
once sync.Once
) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e773f95f219ece9c382ac372273a9f3a7d60eb1a | rules/process_freebsd_amd64.go |
<mask>
<mask> return filepath.Base(string(buf[:size-1])), nil
<mask> }
<mask>
<mask> func searchSocketPid(socket uint64) (uint32, error) {
<mask> value, err := syscall.Sysctl("kern.file")
<mask> if err != nil {
<mask> return 0, err
<mask> }
<mask>
<mask> buf := []byte(value)
<mask>
<mask> // struct xfile
<mask> itemSize := 128
<mask> for i := 0; i+itemSize <= len(buf); i += itemSize {
<mask> // xfile.xf_data
<mask> data := binary.BigEndian.Uint64(buf[i+56 : i+64])
<mask> if data == socket {
<mask> // xfile.xf_pid
<mask> pid := readNativeUint32(buf[i+8 : i+12])
<mask> return pid, nil
<mask> }
<mask> }
<mask> return 0, errors.New("pid not found")
<mask> }
<mask>
<mask> func getExecPathFromAddress(metadata *C.Metadata) (string, error) {
<mask> ip := metadata.SrcIP
<mask> port, err := strconv.Atoi(metadata.SrcPort)
<mask> if err != nil {
<mask> return "", err
</s> Fix: PROCESS-NAME on FreeBSD 11.x (#947) </s> remove socket := binary.BigEndian.Uint64(buf[inp+16 : inp+24])
pid, err := searchSocketPid(socket)
if err != nil {
return "", err
</s> add socket := binary.BigEndian.Uint64(buf[inp+s.socket : inp+s.socket+8])
return s.searchSocketPid(socket)
}
return 0, errNotFound
}
func (s *searcher) searchSocketPid(socket uint64) (uint32, error) {
value, err := syscall.Sysctl("kern.file")
if err != nil {
return 0, err
}
buf := []byte(value)
// struct xfile
itemSize := s.fileItemSize
for i := 0; i+itemSize <= len(buf); i += itemSize {
// xfile.xf_data
data := binary.BigEndian.Uint64(buf[i+s.data : i+s.data+8])
if data == socket {
// xfile.xf_pid
pid := readNativeUint32(buf[i+s.pid : i+s.pid+4])
return pid, nil </s> remove // skip the first xinpgen(64 bytes) block
for i := 64; i+itemSize <= len(buf); i += itemSize {
</s> add pid, err := defaultSearcher.Search(buf, ip, uint16(port), isTCP)
if err != nil {
return "", err
}
return getExecPathFromPID(pid)
}
func readNativeUint32(b []byte) uint32 {
return *(*uint32)(unsafe.Pointer(&b[0]))
}
type searcher struct {
// sizeof(struct xinpgen)
headSize int
// sizeof(struct xtcpcb)
tcpItemSize int
// sizeof(struct xinpcb)
udpItemSize int
udpInpOffset int
port int
ip int
vflag int
socket int
// sizeof(struct xfile)
fileItemSize int
data int
pid int
}
func (s *searcher) Search(buf []byte, ip net.IP, port uint16, isTCP bool) (uint32, error) {
var itemSize int
var inpOffset int
if isTCP {
// struct xtcpcb
itemSize = s.tcpItemSize
inpOffset = 8
} else {
// struct xinpcb
itemSize = s.udpItemSize
inpOffset = s.udpInpOffset
}
isIPv4 := ip.To4() != nil
// skip the first xinpgen block
for i := s.headSize; i+itemSize <= len(buf); i += itemSize { </s> remove func readNativeUint32(b []byte) uint32 {
return *(*uint32)(unsafe.Pointer(&b[0]))
</s> add func initSearcher() error {
osRelease, err := syscall.Sysctl("kern.osrelease")
if err != nil {
return err
}
dot := strings.Index(osRelease, ".")
if dot != -1 {
osRelease = osRelease[:dot]
}
major, err := strconv.Atoi(osRelease)
if err != nil {
return err
}
defaultSearcher = newSearcher(major)
if defaultSearcher == nil {
return fmt.Errorf("unsupported freebsd version %d", major)
}
return nil </s> remove srcPort := binary.BigEndian.Uint16(buf[inp+254 : inp+256])
</s> add srcPort := binary.BigEndian.Uint16(buf[inp+s.port : inp+s.port+2]) </s> remove isIPv4 := ip.To4() != nil
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/Dreamacro/clash/commit/e773f95f219ece9c382ac372273a9f3a7d60eb1a | rules/process_freebsd_amd64.go | |
var isTCP bool | <mask> return "", err
<mask> }
<mask>
<mask> var spath string
<mask> var itemSize int
<mask> var inpOffset int
<mask> switch metadata.NetWork {
<mask> case C.TCP:
<mask> spath = "net.inet.tcp.pcblist"
<mask> // struct xtcpcb
<mask> itemSize = 744
</s> Fix: PROCESS-NAME on FreeBSD 11.x (#947) </s> remove // struct xtcpcb
itemSize = 744
inpOffset = 8
</s> add isTCP = true </s> remove // skip the first xinpgen(64 bytes) block
for i := 64; i+itemSize <= len(buf); i += itemSize {
</s> add pid, err := defaultSearcher.Search(buf, ip, uint16(port), isTCP)
if err != nil {
return "", err
}
return getExecPathFromPID(pid)
}
func readNativeUint32(b []byte) uint32 {
return *(*uint32)(unsafe.Pointer(&b[0]))
}
type searcher struct {
// sizeof(struct xinpgen)
headSize int
// sizeof(struct xtcpcb)
tcpItemSize int
// sizeof(struct xinpcb)
udpItemSize int
udpInpOffset int
port int
ip int
vflag int
socket int
// sizeof(struct xfile)
fileItemSize int
data int
pid int
}
func (s *searcher) Search(buf []byte, ip net.IP, port uint16, isTCP bool) (uint32, error) {
var itemSize int
var inpOffset int
if isTCP {
// struct xtcpcb
itemSize = s.tcpItemSize
inpOffset = 8
} else {
// struct xinpcb
itemSize = s.udpItemSize
inpOffset = s.udpInpOffset
}
isIPv4 := ip.To4() != nil
// skip the first xinpgen block
for i := s.headSize; i+itemSize <= len(buf); i += itemSize { </s> remove // struct xinpcb
itemSize = 400
inpOffset = 0
</s> add isTCP = false </s> remove var processCache = cache.NewLRUCache(cache.WithAge(2), cache.WithSize(64))
</s> add var (
processCache = cache.NewLRUCache(cache.WithAge(2), cache.WithSize(64))
errNotFound = errors.New("process not found")
matchMeta = func(p *Process, m *C.Metadata) bool { return false }
defaultSearcher *searcher
once sync.Once
) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e773f95f219ece9c382ac372273a9f3a7d60eb1a | rules/process_freebsd_amd64.go |
isTCP = true | <mask> var inpOffset int
<mask> switch metadata.NetWork {
<mask> case C.TCP:
<mask> spath = "net.inet.tcp.pcblist"
<mask> // struct xtcpcb
<mask> itemSize = 744
<mask> inpOffset = 8
<mask> case C.UDP:
<mask> spath = "net.inet.udp.pcblist"
<mask> // struct xinpcb
<mask> itemSize = 400
<mask> inpOffset = 0
</s> Fix: PROCESS-NAME on FreeBSD 11.x (#947) </s> remove var itemSize int
var inpOffset int
</s> add var isTCP bool </s> remove // struct xinpcb
itemSize = 400
inpOffset = 0
</s> add isTCP = false </s> remove // skip the first xinpgen(64 bytes) block
for i := 64; i+itemSize <= len(buf); i += itemSize {
</s> add pid, err := defaultSearcher.Search(buf, ip, uint16(port), isTCP)
if err != nil {
return "", err
}
return getExecPathFromPID(pid)
}
func readNativeUint32(b []byte) uint32 {
return *(*uint32)(unsafe.Pointer(&b[0]))
}
type searcher struct {
// sizeof(struct xinpgen)
headSize int
// sizeof(struct xtcpcb)
tcpItemSize int
// sizeof(struct xinpcb)
udpItemSize int
udpInpOffset int
port int
ip int
vflag int
socket int
// sizeof(struct xfile)
fileItemSize int
data int
pid int
}
func (s *searcher) Search(buf []byte, ip net.IP, port uint16, isTCP bool) (uint32, error) {
var itemSize int
var inpOffset int
if isTCP {
// struct xtcpcb
itemSize = s.tcpItemSize
inpOffset = 8
} else {
// struct xinpcb
itemSize = s.udpItemSize
inpOffset = s.udpInpOffset
}
isIPv4 := ip.To4() != nil
// skip the first xinpgen block
for i := s.headSize; i+itemSize <= len(buf); i += itemSize { </s> remove srcIP = net.IP(buf[inp+284 : inp+288])
</s> add srcIP = net.IP(buf[inp+s.ip : inp+s.ip+4]) </s> remove srcIP = net.IP(buf[inp+272 : inp+288])
</s> add srcIP = net.IP(buf[inp+s.ip-12 : inp+s.ip+4]) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e773f95f219ece9c382ac372273a9f3a7d60eb1a | rules/process_freebsd_amd64.go |
isTCP = false | <mask> itemSize = 744
<mask> inpOffset = 8
<mask> case C.UDP:
<mask> spath = "net.inet.udp.pcblist"
<mask> // struct xinpcb
<mask> itemSize = 400
<mask> inpOffset = 0
<mask> default:
<mask> return "", ErrInvalidNetwork
<mask> }
<mask>
<mask> isIPv4 := ip.To4() != nil
</s> Fix: PROCESS-NAME on FreeBSD 11.x (#947) </s> remove // struct xtcpcb
itemSize = 744
inpOffset = 8
</s> add isTCP = true </s> remove var itemSize int
var inpOffset int
</s> add var isTCP bool </s> remove // skip the first xinpgen(64 bytes) block
for i := 64; i+itemSize <= len(buf); i += itemSize {
</s> add pid, err := defaultSearcher.Search(buf, ip, uint16(port), isTCP)
if err != nil {
return "", err
}
return getExecPathFromPID(pid)
}
func readNativeUint32(b []byte) uint32 {
return *(*uint32)(unsafe.Pointer(&b[0]))
}
type searcher struct {
// sizeof(struct xinpgen)
headSize int
// sizeof(struct xtcpcb)
tcpItemSize int
// sizeof(struct xinpcb)
udpItemSize int
udpInpOffset int
port int
ip int
vflag int
socket int
// sizeof(struct xfile)
fileItemSize int
data int
pid int
}
func (s *searcher) Search(buf []byte, ip net.IP, port uint16, isTCP bool) (uint32, error) {
var itemSize int
var inpOffset int
if isTCP {
// struct xtcpcb
itemSize = s.tcpItemSize
inpOffset = 8
} else {
// struct xinpcb
itemSize = s.udpItemSize
inpOffset = s.udpInpOffset
}
isIPv4 := ip.To4() != nil
// skip the first xinpgen block
for i := s.headSize; i+itemSize <= len(buf); i += itemSize { </s> remove isIPv4 := ip.To4() != nil
</s> add </s> remove srcIP = net.IP(buf[inp+272 : inp+288])
</s> add srcIP = net.IP(buf[inp+s.ip-12 : inp+s.ip+4]) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e773f95f219ece9c382ac372273a9f3a7d60eb1a | rules/process_freebsd_amd64.go |
<mask> default:
<mask> return "", ErrInvalidNetwork
<mask> }
<mask>
<mask> isIPv4 := ip.To4() != nil
<mask>
<mask> value, err := syscall.Sysctl(spath)
<mask> if err != nil {
<mask> return "", err
<mask> }
<mask>
</s> Fix: PROCESS-NAME on FreeBSD 11.x (#947) </s> remove // struct xinpcb
itemSize = 400
inpOffset = 0
</s> add isTCP = false </s> remove func searchSocketPid(socket uint64) (uint32, error) {
value, err := syscall.Sysctl("kern.file")
if err != nil {
return 0, err
}
buf := []byte(value)
// struct xfile
itemSize := 128
for i := 0; i+itemSize <= len(buf); i += itemSize {
// xfile.xf_data
data := binary.BigEndian.Uint64(buf[i+56 : i+64])
if data == socket {
// xfile.xf_pid
pid := readNativeUint32(buf[i+8 : i+12])
return pid, nil
}
}
return 0, errors.New("pid not found")
}
</s> add </s> remove func readNativeUint32(b []byte) uint32 {
return *(*uint32)(unsafe.Pointer(&b[0]))
</s> add func initSearcher() error {
osRelease, err := syscall.Sysctl("kern.osrelease")
if err != nil {
return err
}
dot := strings.Index(osRelease, ".")
if dot != -1 {
osRelease = osRelease[:dot]
}
major, err := strconv.Atoi(osRelease)
if err != nil {
return err
}
defaultSearcher = newSearcher(major)
if defaultSearcher == nil {
return fmt.Errorf("unsupported freebsd version %d", major)
}
return nil </s> remove socket := binary.BigEndian.Uint64(buf[inp+16 : inp+24])
pid, err := searchSocketPid(socket)
if err != nil {
return "", err
</s> add socket := binary.BigEndian.Uint64(buf[inp+s.socket : inp+s.socket+8])
return s.searchSocketPid(socket)
}
return 0, errNotFound
}
func (s *searcher) searchSocketPid(socket uint64) (uint32, error) {
value, err := syscall.Sysctl("kern.file")
if err != nil {
return 0, err
}
buf := []byte(value)
// struct xfile
itemSize := s.fileItemSize
for i := 0; i+itemSize <= len(buf); i += itemSize {
// xfile.xf_data
data := binary.BigEndian.Uint64(buf[i+s.data : i+s.data+8])
if data == socket {
// xfile.xf_pid
pid := readNativeUint32(buf[i+s.pid : i+s.pid+4])
return pid, nil </s> remove return getExecPathFromPID(pid)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e773f95f219ece9c382ac372273a9f3a7d60eb1a | rules/process_freebsd_amd64.go | |
pid, err := defaultSearcher.Search(buf, ip, uint16(port), isTCP)
if err != nil {
return "", err
}
return getExecPathFromPID(pid)
}
func readNativeUint32(b []byte) uint32 {
return *(*uint32)(unsafe.Pointer(&b[0]))
}
type searcher struct {
// sizeof(struct xinpgen)
headSize int
// sizeof(struct xtcpcb)
tcpItemSize int
// sizeof(struct xinpcb)
udpItemSize int
udpInpOffset int
port int
ip int
vflag int
socket int
// sizeof(struct xfile)
fileItemSize int
data int
pid int
}
func (s *searcher) Search(buf []byte, ip net.IP, port uint16, isTCP bool) (uint32, error) {
var itemSize int
var inpOffset int
if isTCP {
// struct xtcpcb
itemSize = s.tcpItemSize
inpOffset = 8
} else {
// struct xinpcb
itemSize = s.udpItemSize
inpOffset = s.udpInpOffset
}
isIPv4 := ip.To4() != nil
// skip the first xinpgen block
for i := s.headSize; i+itemSize <= len(buf); i += itemSize { | <mask> }
<mask>
<mask> buf := []byte(value)
<mask>
<mask> // skip the first xinpgen(64 bytes) block
<mask> for i := 64; i+itemSize <= len(buf); i += itemSize {
<mask> inp := i + inpOffset
<mask>
<mask> srcPort := binary.BigEndian.Uint16(buf[inp+254 : inp+256])
<mask>
<mask> if uint16(port) != srcPort {
</s> Fix: PROCESS-NAME on FreeBSD 11.x (#947) </s> remove srcPort := binary.BigEndian.Uint16(buf[inp+254 : inp+256])
</s> add srcPort := binary.BigEndian.Uint16(buf[inp+s.port : inp+s.port+2]) </s> remove if uint16(port) != srcPort {
</s> add if port != srcPort { </s> remove func searchSocketPid(socket uint64) (uint32, error) {
value, err := syscall.Sysctl("kern.file")
if err != nil {
return 0, err
}
buf := []byte(value)
// struct xfile
itemSize := 128
for i := 0; i+itemSize <= len(buf); i += itemSize {
// xfile.xf_data
data := binary.BigEndian.Uint64(buf[i+56 : i+64])
if data == socket {
// xfile.xf_pid
pid := readNativeUint32(buf[i+8 : i+12])
return pid, nil
}
}
return 0, errors.New("pid not found")
}
</s> add </s> remove socket := binary.BigEndian.Uint64(buf[inp+16 : inp+24])
pid, err := searchSocketPid(socket)
if err != nil {
return "", err
</s> add socket := binary.BigEndian.Uint64(buf[inp+s.socket : inp+s.socket+8])
return s.searchSocketPid(socket)
}
return 0, errNotFound
}
func (s *searcher) searchSocketPid(socket uint64) (uint32, error) {
value, err := syscall.Sysctl("kern.file")
if err != nil {
return 0, err
}
buf := []byte(value)
// struct xfile
itemSize := s.fileItemSize
for i := 0; i+itemSize <= len(buf); i += itemSize {
// xfile.xf_data
data := binary.BigEndian.Uint64(buf[i+s.data : i+s.data+8])
if data == socket {
// xfile.xf_pid
pid := readNativeUint32(buf[i+s.pid : i+s.pid+4])
return pid, nil </s> remove func readNativeUint32(b []byte) uint32 {
return *(*uint32)(unsafe.Pointer(&b[0]))
</s> add func initSearcher() error {
osRelease, err := syscall.Sysctl("kern.osrelease")
if err != nil {
return err
}
dot := strings.Index(osRelease, ".")
if dot != -1 {
osRelease = osRelease[:dot]
}
major, err := strconv.Atoi(osRelease)
if err != nil {
return err
}
defaultSearcher = newSearcher(major)
if defaultSearcher == nil {
return fmt.Errorf("unsupported freebsd version %d", major)
}
return nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e773f95f219ece9c382ac372273a9f3a7d60eb1a | rules/process_freebsd_amd64.go |
srcPort := binary.BigEndian.Uint16(buf[inp+s.port : inp+s.port+2]) | <mask> // skip the first xinpgen(64 bytes) block
<mask> for i := 64; i+itemSize <= len(buf); i += itemSize {
<mask> inp := i + inpOffset
<mask>
<mask> srcPort := binary.BigEndian.Uint16(buf[inp+254 : inp+256])
<mask>
<mask> if uint16(port) != srcPort {
<mask> continue
<mask> }
<mask>
</s> Fix: PROCESS-NAME on FreeBSD 11.x (#947) </s> remove // skip the first xinpgen(64 bytes) block
for i := 64; i+itemSize <= len(buf); i += itemSize {
</s> add pid, err := defaultSearcher.Search(buf, ip, uint16(port), isTCP)
if err != nil {
return "", err
}
return getExecPathFromPID(pid)
}
func readNativeUint32(b []byte) uint32 {
return *(*uint32)(unsafe.Pointer(&b[0]))
}
type searcher struct {
// sizeof(struct xinpgen)
headSize int
// sizeof(struct xtcpcb)
tcpItemSize int
// sizeof(struct xinpcb)
udpItemSize int
udpInpOffset int
port int
ip int
vflag int
socket int
// sizeof(struct xfile)
fileItemSize int
data int
pid int
}
func (s *searcher) Search(buf []byte, ip net.IP, port uint16, isTCP bool) (uint32, error) {
var itemSize int
var inpOffset int
if isTCP {
// struct xtcpcb
itemSize = s.tcpItemSize
inpOffset = 8
} else {
// struct xinpcb
itemSize = s.udpItemSize
inpOffset = s.udpInpOffset
}
isIPv4 := ip.To4() != nil
// skip the first xinpgen block
for i := s.headSize; i+itemSize <= len(buf); i += itemSize { </s> remove if uint16(port) != srcPort {
</s> add if port != srcPort { </s> remove func searchSocketPid(socket uint64) (uint32, error) {
value, err := syscall.Sysctl("kern.file")
if err != nil {
return 0, err
}
buf := []byte(value)
// struct xfile
itemSize := 128
for i := 0; i+itemSize <= len(buf); i += itemSize {
// xfile.xf_data
data := binary.BigEndian.Uint64(buf[i+56 : i+64])
if data == socket {
// xfile.xf_pid
pid := readNativeUint32(buf[i+8 : i+12])
return pid, nil
}
}
return 0, errors.New("pid not found")
}
</s> add </s> remove socket := binary.BigEndian.Uint64(buf[inp+16 : inp+24])
pid, err := searchSocketPid(socket)
if err != nil {
return "", err
</s> add socket := binary.BigEndian.Uint64(buf[inp+s.socket : inp+s.socket+8])
return s.searchSocketPid(socket)
}
return 0, errNotFound
}
func (s *searcher) searchSocketPid(socket uint64) (uint32, error) {
value, err := syscall.Sysctl("kern.file")
if err != nil {
return 0, err
}
buf := []byte(value)
// struct xfile
itemSize := s.fileItemSize
for i := 0; i+itemSize <= len(buf); i += itemSize {
// xfile.xf_data
data := binary.BigEndian.Uint64(buf[i+s.data : i+s.data+8])
if data == socket {
// xfile.xf_pid
pid := readNativeUint32(buf[i+s.pid : i+s.pid+4])
return pid, nil </s> remove func readNativeUint32(b []byte) uint32 {
return *(*uint32)(unsafe.Pointer(&b[0]))
</s> add func initSearcher() error {
osRelease, err := syscall.Sysctl("kern.osrelease")
if err != nil {
return err
}
dot := strings.Index(osRelease, ".")
if dot != -1 {
osRelease = osRelease[:dot]
}
major, err := strconv.Atoi(osRelease)
if err != nil {
return err
}
defaultSearcher = newSearcher(major)
if defaultSearcher == nil {
return fmt.Errorf("unsupported freebsd version %d", major)
}
return nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e773f95f219ece9c382ac372273a9f3a7d60eb1a | rules/process_freebsd_amd64.go |
if port != srcPort { | <mask> inp := i + inpOffset
<mask>
<mask> srcPort := binary.BigEndian.Uint16(buf[inp+254 : inp+256])
<mask>
<mask> if uint16(port) != srcPort {
<mask> continue
<mask> }
<mask>
<mask> // xinpcb.inp_vflag
<mask> flag := buf[inp+392]
</s> Fix: PROCESS-NAME on FreeBSD 11.x (#947) </s> remove srcPort := binary.BigEndian.Uint16(buf[inp+254 : inp+256])
</s> add srcPort := binary.BigEndian.Uint16(buf[inp+s.port : inp+s.port+2]) </s> remove // skip the first xinpgen(64 bytes) block
for i := 64; i+itemSize <= len(buf); i += itemSize {
</s> add pid, err := defaultSearcher.Search(buf, ip, uint16(port), isTCP)
if err != nil {
return "", err
}
return getExecPathFromPID(pid)
}
func readNativeUint32(b []byte) uint32 {
return *(*uint32)(unsafe.Pointer(&b[0]))
}
type searcher struct {
// sizeof(struct xinpgen)
headSize int
// sizeof(struct xtcpcb)
tcpItemSize int
// sizeof(struct xinpcb)
udpItemSize int
udpInpOffset int
port int
ip int
vflag int
socket int
// sizeof(struct xfile)
fileItemSize int
data int
pid int
}
func (s *searcher) Search(buf []byte, ip net.IP, port uint16, isTCP bool) (uint32, error) {
var itemSize int
var inpOffset int
if isTCP {
// struct xtcpcb
itemSize = s.tcpItemSize
inpOffset = 8
} else {
// struct xinpcb
itemSize = s.udpItemSize
inpOffset = s.udpInpOffset
}
isIPv4 := ip.To4() != nil
// skip the first xinpgen block
for i := s.headSize; i+itemSize <= len(buf); i += itemSize { </s> remove flag := buf[inp+392]
</s> add flag := buf[inp+s.vflag] </s> remove socket := binary.BigEndian.Uint64(buf[inp+16 : inp+24])
pid, err := searchSocketPid(socket)
if err != nil {
return "", err
</s> add socket := binary.BigEndian.Uint64(buf[inp+s.socket : inp+s.socket+8])
return s.searchSocketPid(socket)
}
return 0, errNotFound
}
func (s *searcher) searchSocketPid(socket uint64) (uint32, error) {
value, err := syscall.Sysctl("kern.file")
if err != nil {
return 0, err
}
buf := []byte(value)
// struct xfile
itemSize := s.fileItemSize
for i := 0; i+itemSize <= len(buf); i += itemSize {
// xfile.xf_data
data := binary.BigEndian.Uint64(buf[i+s.data : i+s.data+8])
if data == socket {
// xfile.xf_pid
pid := readNativeUint32(buf[i+s.pid : i+s.pid+4])
return pid, nil </s> remove func searchSocketPid(socket uint64) (uint32, error) {
value, err := syscall.Sysctl("kern.file")
if err != nil {
return 0, err
}
buf := []byte(value)
// struct xfile
itemSize := 128
for i := 0; i+itemSize <= len(buf); i += itemSize {
// xfile.xf_data
data := binary.BigEndian.Uint64(buf[i+56 : i+64])
if data == socket {
// xfile.xf_pid
pid := readNativeUint32(buf[i+8 : i+12])
return pid, nil
}
}
return 0, errors.New("pid not found")
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e773f95f219ece9c382ac372273a9f3a7d60eb1a | rules/process_freebsd_amd64.go |
flag := buf[inp+s.vflag] | <mask> continue
<mask> }
<mask>
<mask> // xinpcb.inp_vflag
<mask> flag := buf[inp+392]
<mask>
<mask> var srcIP net.IP
<mask> switch {
<mask> case flag&0x1 > 0 && isIPv4:
<mask> // ipv4
</s> Fix: PROCESS-NAME on FreeBSD 11.x (#947) </s> remove srcIP = net.IP(buf[inp+284 : inp+288])
</s> add srcIP = net.IP(buf[inp+s.ip : inp+s.ip+4]) </s> remove srcIP = net.IP(buf[inp+272 : inp+288])
</s> add srcIP = net.IP(buf[inp+s.ip-12 : inp+s.ip+4]) </s> remove if uint16(port) != srcPort {
</s> add if port != srcPort { </s> remove // struct xtcpcb
itemSize = 744
inpOffset = 8
</s> add isTCP = true </s> remove var itemSize int
var inpOffset int
</s> add var isTCP bool | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e773f95f219ece9c382ac372273a9f3a7d60eb1a | rules/process_freebsd_amd64.go |
srcIP = net.IP(buf[inp+s.ip : inp+s.ip+4]) | <mask> var srcIP net.IP
<mask> switch {
<mask> case flag&0x1 > 0 && isIPv4:
<mask> // ipv4
<mask> srcIP = net.IP(buf[inp+284 : inp+288])
<mask> case flag&0x2 > 0 && !isIPv4:
<mask> // ipv6
<mask> srcIP = net.IP(buf[inp+272 : inp+288])
<mask> default:
<mask> continue
</s> Fix: PROCESS-NAME on FreeBSD 11.x (#947) </s> remove srcIP = net.IP(buf[inp+272 : inp+288])
</s> add srcIP = net.IP(buf[inp+s.ip-12 : inp+s.ip+4]) </s> remove flag := buf[inp+392]
</s> add flag := buf[inp+s.vflag] </s> remove // struct xtcpcb
itemSize = 744
inpOffset = 8
</s> add isTCP = true </s> remove // struct xinpcb
itemSize = 400
inpOffset = 0
</s> add isTCP = false </s> remove var itemSize int
var inpOffset int
</s> add var isTCP bool | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e773f95f219ece9c382ac372273a9f3a7d60eb1a | rules/process_freebsd_amd64.go |
srcIP = net.IP(buf[inp+s.ip-12 : inp+s.ip+4]) | <mask> // ipv4
<mask> srcIP = net.IP(buf[inp+284 : inp+288])
<mask> case flag&0x2 > 0 && !isIPv4:
<mask> // ipv6
<mask> srcIP = net.IP(buf[inp+272 : inp+288])
<mask> default:
<mask> continue
<mask> }
<mask>
<mask> if !ip.Equal(srcIP) {
</s> Fix: PROCESS-NAME on FreeBSD 11.x (#947) </s> remove srcIP = net.IP(buf[inp+284 : inp+288])
</s> add srcIP = net.IP(buf[inp+s.ip : inp+s.ip+4]) </s> remove flag := buf[inp+392]
</s> add flag := buf[inp+s.vflag] </s> remove // struct xinpcb
itemSize = 400
inpOffset = 0
</s> add isTCP = false </s> remove // struct xtcpcb
itemSize = 744
inpOffset = 8
</s> add isTCP = true </s> remove if uint16(port) != srcPort {
</s> add if port != srcPort { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e773f95f219ece9c382ac372273a9f3a7d60eb1a | rules/process_freebsd_amd64.go |
socket := binary.BigEndian.Uint64(buf[inp+s.socket : inp+s.socket+8])
return s.searchSocketPid(socket)
}
return 0, errNotFound
}
func (s *searcher) searchSocketPid(socket uint64) (uint32, error) {
value, err := syscall.Sysctl("kern.file")
if err != nil {
return 0, err
}
buf := []byte(value)
// struct xfile
itemSize := s.fileItemSize
for i := 0; i+itemSize <= len(buf); i += itemSize {
// xfile.xf_data
data := binary.BigEndian.Uint64(buf[i+s.data : i+s.data+8])
if data == socket {
// xfile.xf_pid
pid := readNativeUint32(buf[i+s.pid : i+s.pid+4])
return pid, nil | <mask> continue
<mask> }
<mask>
<mask> // xsocket.xso_so, interpreted as big endian anyway since it's only used for comparison
<mask> socket := binary.BigEndian.Uint64(buf[inp+16 : inp+24])
<mask> pid, err := searchSocketPid(socket)
<mask> if err != nil {
<mask> return "", err
<mask> }
<mask> return getExecPathFromPID(pid)
<mask> }
<mask>
<mask> return "", errors.New("process not found")
</s> Fix: PROCESS-NAME on FreeBSD 11.x (#947) </s> remove return getExecPathFromPID(pid)
</s> add </s> remove func searchSocketPid(socket uint64) (uint32, error) {
value, err := syscall.Sysctl("kern.file")
if err != nil {
return 0, err
}
buf := []byte(value)
// struct xfile
itemSize := 128
for i := 0; i+itemSize <= len(buf); i += itemSize {
// xfile.xf_data
data := binary.BigEndian.Uint64(buf[i+56 : i+64])
if data == socket {
// xfile.xf_pid
pid := readNativeUint32(buf[i+8 : i+12])
return pid, nil
}
}
return 0, errors.New("pid not found")
}
</s> add </s> remove func readNativeUint32(b []byte) uint32 {
return *(*uint32)(unsafe.Pointer(&b[0]))
</s> add func initSearcher() error {
osRelease, err := syscall.Sysctl("kern.osrelease")
if err != nil {
return err
}
dot := strings.Index(osRelease, ".")
if dot != -1 {
osRelease = osRelease[:dot]
}
major, err := strconv.Atoi(osRelease)
if err != nil {
return err
}
defaultSearcher = newSearcher(major)
if defaultSearcher == nil {
return fmt.Errorf("unsupported freebsd version %d", major)
}
return nil </s> remove // skip the first xinpgen(64 bytes) block
for i := 64; i+itemSize <= len(buf); i += itemSize {
</s> add pid, err := defaultSearcher.Search(buf, ip, uint16(port), isTCP)
if err != nil {
return "", err
}
return getExecPathFromPID(pid)
}
func readNativeUint32(b []byte) uint32 {
return *(*uint32)(unsafe.Pointer(&b[0]))
}
type searcher struct {
// sizeof(struct xinpgen)
headSize int
// sizeof(struct xtcpcb)
tcpItemSize int
// sizeof(struct xinpcb)
udpItemSize int
udpInpOffset int
port int
ip int
vflag int
socket int
// sizeof(struct xfile)
fileItemSize int
data int
pid int
}
func (s *searcher) Search(buf []byte, ip net.IP, port uint16, isTCP bool) (uint32, error) {
var itemSize int
var inpOffset int
if isTCP {
// struct xtcpcb
itemSize = s.tcpItemSize
inpOffset = 8
} else {
// struct xinpcb
itemSize = s.udpItemSize
inpOffset = s.udpInpOffset
}
isIPv4 := ip.To4() != nil
// skip the first xinpgen block
for i := s.headSize; i+itemSize <= len(buf); i += itemSize { </s> remove isIPv4 := ip.To4() != nil
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e773f95f219ece9c382ac372273a9f3a7d60eb1a | rules/process_freebsd_amd64.go |
<mask> pid, err := searchSocketPid(socket)
<mask> if err != nil {
<mask> return "", err
<mask> }
<mask> return getExecPathFromPID(pid)
<mask> }
<mask>
<mask> return "", errors.New("process not found")
<mask> }
<mask>
</s> Fix: PROCESS-NAME on FreeBSD 11.x (#947) </s> remove socket := binary.BigEndian.Uint64(buf[inp+16 : inp+24])
pid, err := searchSocketPid(socket)
if err != nil {
return "", err
</s> add socket := binary.BigEndian.Uint64(buf[inp+s.socket : inp+s.socket+8])
return s.searchSocketPid(socket)
}
return 0, errNotFound
}
func (s *searcher) searchSocketPid(socket uint64) (uint32, error) {
value, err := syscall.Sysctl("kern.file")
if err != nil {
return 0, err
}
buf := []byte(value)
// struct xfile
itemSize := s.fileItemSize
for i := 0; i+itemSize <= len(buf); i += itemSize {
// xfile.xf_data
data := binary.BigEndian.Uint64(buf[i+s.data : i+s.data+8])
if data == socket {
// xfile.xf_pid
pid := readNativeUint32(buf[i+s.pid : i+s.pid+4])
return pid, nil </s> remove func readNativeUint32(b []byte) uint32 {
return *(*uint32)(unsafe.Pointer(&b[0]))
</s> add func initSearcher() error {
osRelease, err := syscall.Sysctl("kern.osrelease")
if err != nil {
return err
}
dot := strings.Index(osRelease, ".")
if dot != -1 {
osRelease = osRelease[:dot]
}
major, err := strconv.Atoi(osRelease)
if err != nil {
return err
}
defaultSearcher = newSearcher(major)
if defaultSearcher == nil {
return fmt.Errorf("unsupported freebsd version %d", major)
}
return nil </s> remove func searchSocketPid(socket uint64) (uint32, error) {
value, err := syscall.Sysctl("kern.file")
if err != nil {
return 0, err
}
buf := []byte(value)
// struct xfile
itemSize := 128
for i := 0; i+itemSize <= len(buf); i += itemSize {
// xfile.xf_data
data := binary.BigEndian.Uint64(buf[i+56 : i+64])
if data == socket {
// xfile.xf_pid
pid := readNativeUint32(buf[i+8 : i+12])
return pid, nil
}
}
return 0, errors.New("pid not found")
}
</s> add </s> remove isIPv4 := ip.To4() != nil
</s> add </s> remove return "", errors.New("process not found")
</s> add func newSearcher(major int) *searcher {
var s *searcher = nil
switch major {
case 11:
s = &searcher{
headSize: 32,
tcpItemSize: 1304,
udpItemSize: 632,
port: 198,
ip: 228,
vflag: 116,
socket: 88,
fileItemSize: 80,
data: 56,
pid: 8,
udpInpOffset: 8,
}
case 12:
s = &searcher{
headSize: 64,
tcpItemSize: 744,
udpItemSize: 400,
port: 254,
ip: 284,
vflag: 392,
socket: 16,
fileItemSize: 128,
data: 56,
pid: 8,
}
}
return s | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e773f95f219ece9c382ac372273a9f3a7d60eb1a | rules/process_freebsd_amd64.go | |
return 0, errNotFound
} | <mask> pid := readNativeUint32(buf[i+s.pid : i+s.pid+4])
<mask> return pid, nil
<mask> }
<mask> }
<mask>
<mask> func newSearcher(major int) *searcher {
<mask> var s *searcher = nil
<mask> switch major {
<mask> case 11:
</s> Fix: PROCESS-NAME on FreeBSD 11.x (#947) </s> remove return "", errors.New("process not found")
</s> add func newSearcher(major int) *searcher {
var s *searcher = nil
switch major {
case 11:
s = &searcher{
headSize: 32,
tcpItemSize: 1304,
udpItemSize: 632,
port: 198,
ip: 228,
vflag: 116,
socket: 88,
fileItemSize: 80,
data: 56,
pid: 8,
udpInpOffset: 8,
}
case 12:
s = &searcher{
headSize: 64,
tcpItemSize: 744,
udpItemSize: 400,
port: 254,
ip: 284,
vflag: 392,
socket: 16,
fileItemSize: 128,
data: 56,
pid: 8,
}
}
return s </s> remove socket := binary.BigEndian.Uint64(buf[inp+16 : inp+24])
pid, err := searchSocketPid(socket)
if err != nil {
return "", err
</s> add socket := binary.BigEndian.Uint64(buf[inp+s.socket : inp+s.socket+8])
return s.searchSocketPid(socket)
}
return 0, errNotFound
}
func (s *searcher) searchSocketPid(socket uint64) (uint32, error) {
value, err := syscall.Sysctl("kern.file")
if err != nil {
return 0, err
}
buf := []byte(value)
// struct xfile
itemSize := s.fileItemSize
for i := 0; i+itemSize <= len(buf); i += itemSize {
// xfile.xf_data
data := binary.BigEndian.Uint64(buf[i+s.data : i+s.data+8])
if data == socket {
// xfile.xf_pid
pid := readNativeUint32(buf[i+s.pid : i+s.pid+4])
return pid, nil </s> remove func searchSocketPid(socket uint64) (uint32, error) {
value, err := syscall.Sysctl("kern.file")
if err != nil {
return 0, err
}
buf := []byte(value)
// struct xfile
itemSize := 128
for i := 0; i+itemSize <= len(buf); i += itemSize {
// xfile.xf_data
data := binary.BigEndian.Uint64(buf[i+56 : i+64])
if data == socket {
// xfile.xf_pid
pid := readNativeUint32(buf[i+8 : i+12])
return pid, nil
}
}
return 0, errors.New("pid not found")
}
</s> add </s> remove func readNativeUint32(b []byte) uint32 {
return *(*uint32)(unsafe.Pointer(&b[0]))
</s> add func initSearcher() error {
osRelease, err := syscall.Sysctl("kern.osrelease")
if err != nil {
return err
}
dot := strings.Index(osRelease, ".")
if dot != -1 {
osRelease = osRelease[:dot]
}
major, err := strconv.Atoi(osRelease)
if err != nil {
return err
}
defaultSearcher = newSearcher(major)
if defaultSearcher == nil {
return fmt.Errorf("unsupported freebsd version %d", major)
}
return nil </s> remove // skip the first xinpgen(64 bytes) block
for i := 64; i+itemSize <= len(buf); i += itemSize {
</s> add pid, err := defaultSearcher.Search(buf, ip, uint16(port), isTCP)
if err != nil {
return "", err
}
return getExecPathFromPID(pid)
}
func readNativeUint32(b []byte) uint32 {
return *(*uint32)(unsafe.Pointer(&b[0]))
}
type searcher struct {
// sizeof(struct xinpgen)
headSize int
// sizeof(struct xtcpcb)
tcpItemSize int
// sizeof(struct xinpcb)
udpItemSize int
udpInpOffset int
port int
ip int
vflag int
socket int
// sizeof(struct xfile)
fileItemSize int
data int
pid int
}
func (s *searcher) Search(buf []byte, ip net.IP, port uint16, isTCP bool) (uint32, error) {
var itemSize int
var inpOffset int
if isTCP {
// struct xtcpcb
itemSize = s.tcpItemSize
inpOffset = 8
} else {
// struct xinpcb
itemSize = s.udpItemSize
inpOffset = s.udpInpOffset
}
isIPv4 := ip.To4() != nil
// skip the first xinpgen block
for i := s.headSize; i+itemSize <= len(buf); i += itemSize { | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e773f95f219ece9c382ac372273a9f3a7d60eb1a | rules/process_freebsd_amd64.go |
func newSearcher(major int) *searcher {
var s *searcher = nil
switch major {
case 11:
s = &searcher{
headSize: 32,
tcpItemSize: 1304,
udpItemSize: 632,
port: 198,
ip: 228,
vflag: 116,
socket: 88,
fileItemSize: 80,
data: 56,
pid: 8,
udpInpOffset: 8,
}
case 12:
s = &searcher{
headSize: 64,
tcpItemSize: 744,
udpItemSize: 400,
port: 254,
ip: 284,
vflag: 392,
socket: 16,
fileItemSize: 128,
data: 56,
pid: 8,
}
}
return s | <mask> }
<mask> return getExecPathFromPID(pid)
<mask> }
<mask>
<mask> return "", errors.New("process not found")
<mask> }
<mask>
<mask> func readNativeUint32(b []byte) uint32 {
<mask> return *(*uint32)(unsafe.Pointer(&b[0]))
<mask> }
</s> Fix: PROCESS-NAME on FreeBSD 11.x (#947) </s> remove func readNativeUint32(b []byte) uint32 {
return *(*uint32)(unsafe.Pointer(&b[0]))
</s> add func initSearcher() error {
osRelease, err := syscall.Sysctl("kern.osrelease")
if err != nil {
return err
}
dot := strings.Index(osRelease, ".")
if dot != -1 {
osRelease = osRelease[:dot]
}
major, err := strconv.Atoi(osRelease)
if err != nil {
return err
}
defaultSearcher = newSearcher(major)
if defaultSearcher == nil {
return fmt.Errorf("unsupported freebsd version %d", major)
}
return nil </s> remove return getExecPathFromPID(pid)
</s> add </s> remove socket := binary.BigEndian.Uint64(buf[inp+16 : inp+24])
pid, err := searchSocketPid(socket)
if err != nil {
return "", err
</s> add socket := binary.BigEndian.Uint64(buf[inp+s.socket : inp+s.socket+8])
return s.searchSocketPid(socket)
}
return 0, errNotFound
}
func (s *searcher) searchSocketPid(socket uint64) (uint32, error) {
value, err := syscall.Sysctl("kern.file")
if err != nil {
return 0, err
}
buf := []byte(value)
// struct xfile
itemSize := s.fileItemSize
for i := 0; i+itemSize <= len(buf); i += itemSize {
// xfile.xf_data
data := binary.BigEndian.Uint64(buf[i+s.data : i+s.data+8])
if data == socket {
// xfile.xf_pid
pid := readNativeUint32(buf[i+s.pid : i+s.pid+4])
return pid, nil </s> remove // skip the first xinpgen(64 bytes) block
for i := 64; i+itemSize <= len(buf); i += itemSize {
</s> add pid, err := defaultSearcher.Search(buf, ip, uint16(port), isTCP)
if err != nil {
return "", err
}
return getExecPathFromPID(pid)
}
func readNativeUint32(b []byte) uint32 {
return *(*uint32)(unsafe.Pointer(&b[0]))
}
type searcher struct {
// sizeof(struct xinpgen)
headSize int
// sizeof(struct xtcpcb)
tcpItemSize int
// sizeof(struct xinpcb)
udpItemSize int
udpInpOffset int
port int
ip int
vflag int
socket int
// sizeof(struct xfile)
fileItemSize int
data int
pid int
}
func (s *searcher) Search(buf []byte, ip net.IP, port uint16, isTCP bool) (uint32, error) {
var itemSize int
var inpOffset int
if isTCP {
// struct xtcpcb
itemSize = s.tcpItemSize
inpOffset = 8
} else {
// struct xinpcb
itemSize = s.udpItemSize
inpOffset = s.udpInpOffset
}
isIPv4 := ip.To4() != nil
// skip the first xinpgen block
for i := s.headSize; i+itemSize <= len(buf); i += itemSize { </s> remove func searchSocketPid(socket uint64) (uint32, error) {
value, err := syscall.Sysctl("kern.file")
if err != nil {
return 0, err
}
buf := []byte(value)
// struct xfile
itemSize := 128
for i := 0; i+itemSize <= len(buf); i += itemSize {
// xfile.xf_data
data := binary.BigEndian.Uint64(buf[i+56 : i+64])
if data == socket {
// xfile.xf_pid
pid := readNativeUint32(buf[i+8 : i+12])
return pid, nil
}
}
return 0, errors.New("pid not found")
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e773f95f219ece9c382ac372273a9f3a7d60eb1a | rules/process_freebsd_amd64.go |
func initSearcher() error {
osRelease, err := syscall.Sysctl("kern.osrelease")
if err != nil {
return err
}
dot := strings.Index(osRelease, ".")
if dot != -1 {
osRelease = osRelease[:dot]
}
major, err := strconv.Atoi(osRelease)
if err != nil {
return err
}
defaultSearcher = newSearcher(major)
if defaultSearcher == nil {
return fmt.Errorf("unsupported freebsd version %d", major)
}
return nil | <mask>
<mask> return "", errors.New("process not found")
<mask> }
<mask>
<mask> func readNativeUint32(b []byte) uint32 {
<mask> return *(*uint32)(unsafe.Pointer(&b[0]))
<mask> }
</s> Fix: PROCESS-NAME on FreeBSD 11.x (#947) </s> remove return "", errors.New("process not found")
</s> add func newSearcher(major int) *searcher {
var s *searcher = nil
switch major {
case 11:
s = &searcher{
headSize: 32,
tcpItemSize: 1304,
udpItemSize: 632,
port: 198,
ip: 228,
vflag: 116,
socket: 88,
fileItemSize: 80,
data: 56,
pid: 8,
udpInpOffset: 8,
}
case 12:
s = &searcher{
headSize: 64,
tcpItemSize: 744,
udpItemSize: 400,
port: 254,
ip: 284,
vflag: 392,
socket: 16,
fileItemSize: 128,
data: 56,
pid: 8,
}
}
return s </s> remove return getExecPathFromPID(pid)
</s> add </s> remove // skip the first xinpgen(64 bytes) block
for i := 64; i+itemSize <= len(buf); i += itemSize {
</s> add pid, err := defaultSearcher.Search(buf, ip, uint16(port), isTCP)
if err != nil {
return "", err
}
return getExecPathFromPID(pid)
}
func readNativeUint32(b []byte) uint32 {
return *(*uint32)(unsafe.Pointer(&b[0]))
}
type searcher struct {
// sizeof(struct xinpgen)
headSize int
// sizeof(struct xtcpcb)
tcpItemSize int
// sizeof(struct xinpcb)
udpItemSize int
udpInpOffset int
port int
ip int
vflag int
socket int
// sizeof(struct xfile)
fileItemSize int
data int
pid int
}
func (s *searcher) Search(buf []byte, ip net.IP, port uint16, isTCP bool) (uint32, error) {
var itemSize int
var inpOffset int
if isTCP {
// struct xtcpcb
itemSize = s.tcpItemSize
inpOffset = 8
} else {
// struct xinpcb
itemSize = s.udpItemSize
inpOffset = s.udpInpOffset
}
isIPv4 := ip.To4() != nil
// skip the first xinpgen block
for i := s.headSize; i+itemSize <= len(buf); i += itemSize { </s> remove socket := binary.BigEndian.Uint64(buf[inp+16 : inp+24])
pid, err := searchSocketPid(socket)
if err != nil {
return "", err
</s> add socket := binary.BigEndian.Uint64(buf[inp+s.socket : inp+s.socket+8])
return s.searchSocketPid(socket)
}
return 0, errNotFound
}
func (s *searcher) searchSocketPid(socket uint64) (uint32, error) {
value, err := syscall.Sysctl("kern.file")
if err != nil {
return 0, err
}
buf := []byte(value)
// struct xfile
itemSize := s.fileItemSize
for i := 0; i+itemSize <= len(buf); i += itemSize {
// xfile.xf_data
data := binary.BigEndian.Uint64(buf[i+s.data : i+s.data+8])
if data == socket {
// xfile.xf_pid
pid := readNativeUint32(buf[i+s.pid : i+s.pid+4])
return pid, nil </s> remove func searchSocketPid(socket uint64) (uint32, error) {
value, err := syscall.Sysctl("kern.file")
if err != nil {
return 0, err
}
buf := []byte(value)
// struct xfile
itemSize := 128
for i := 0; i+itemSize <= len(buf); i += itemSize {
// xfile.xf_data
data := binary.BigEndian.Uint64(buf[i+56 : i+64])
if data == socket {
// xfile.xf_pid
pid := readNativeUint32(buf[i+8 : i+12])
return pid, nil
}
}
return 0, errors.New("pid not found")
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep"
] | https://github.com/Dreamacro/clash/commit/e773f95f219ece9c382ac372273a9f3a7d60eb1a | rules/process_freebsd_amd64.go |
"github.com/Dreamacro/clash/constant" | <mask>
<mask> "github.com/Dreamacro/clash/config"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> "github.com/Dreamacro/clash/hub"
<mask> "github.com/Dreamacro/clash/hub/executor"
<mask> "github.com/Dreamacro/clash/log"
</s> Feature: add configuration test command (#524) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e81b88fb94b7de7d90aeb9f356ce1af8e02193c7 | main.go |
"github.com/Dreamacro/clash/hub/executor" | <mask> C "github.com/Dreamacro/clash/constant"
<mask> "github.com/Dreamacro/clash/hub"
<mask> "github.com/Dreamacro/clash/log"
<mask> )
<mask>
<mask> var (
<mask> version bool
<mask> testConfig bool
</s> Feature: add configuration test command (#524) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e81b88fb94b7de7d90aeb9f356ce1af8e02193c7 | main.go |
testConfig bool | <mask>
<mask> var (
<mask> version bool
<mask> homeDir string
<mask> configFile string
<mask> )
<mask>
</s> Feature: add configuration test command (#524) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e81b88fb94b7de7d90aeb9f356ce1af8e02193c7 | main.go |
flag.BoolVar(&testConfig, "t", false, "test configuration and exit") | <mask> func init() {
<mask> flag.StringVar(&homeDir, "d", "", "set configuration directory")
<mask> flag.StringVar(&configFile, "f", "", "specify configuration file")
<mask> flag.BoolVar(&version, "v", false, "show current version of clash")
<mask> flag.Parse()
<mask> }
<mask>
<mask> func main() {
<mask> if version {
</s> Feature: add configuration test command (#524) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e81b88fb94b7de7d90aeb9f356ce1af8e02193c7 | main.go |
if testConfig {
if _, err := executor.Parse(); err != nil {
log.Errorln(err.Error())
fmt.Printf("configuration file %s test failed\n", constant.Path.Config())
os.Exit(1)
}
fmt.Printf("configuration file %s test is successful\n", constant.Path.Config())
return
}
| <mask> if err := config.Init(C.Path.HomeDir()); err != nil {
<mask> log.Fatalln("Initial configuration directory error: %s", err.Error())
<mask> }
<mask>
<mask> if err := hub.Parse(); err != nil {
<mask> log.Fatalln("Parse config error: %s", err.Error())
<mask> }
<mask>
</s> Feature: add configuration test command (#524) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e81b88fb94b7de7d90aeb9f356ce1af8e02193c7 | main.go |
link: "/" + doc.path | <mask>
<mask> items.push({
<mask> sidebarOrder,
<mask> text: sidebarTitle,
<mask> link: doc.path.replace(/^docs/, '')
<mask> })
<mask> }
<mask>
<mask> items = items.sort((a, b) => a.sidebarOrder - b.sidebarOrder)
<mask>
</s> Docs: fix previous/next page button (#2760)
Signed-off-by: Birkhoff Lee <git@birkhoff.me> </s> remove { text: 'Configuration', link: '/configuration/configuration-reference.md' },
</s> add { text: 'Configuration', link: '/configuration/configuration-reference' }, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e8b2d0ecc8ad8856345524ae3cec338caaece7ae | docs/.vitepress/config.ts |
collapsed: false, | <mask>
<mask> return {
<mask> text,
<mask> items,
<mask> }
<mask> }
<mask>
</s> Docs: fix previous/next page button (#2760)
Signed-off-by: Birkhoff Lee <git@birkhoff.me> </s> remove link: doc.path.replace(/^docs/, '')
</s> add link: "/" + doc.path </s> remove { text: 'Configuration', link: '/configuration/configuration-reference.md' },
</s> add { text: 'Configuration', link: '/configuration/configuration-reference' }, | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e8b2d0ecc8ad8856345524ae3cec338caaece7ae | docs/.vitepress/config.ts |
{ text: 'Configuration', link: '/configuration/configuration-reference' }, | <mask>
<mask> // https://vitepress.dev/reference/default-theme-config
<mask> nav: [
<mask> { text: 'Home', link: '/' },
<mask> { text: 'Configuration', link: '/configuration/configuration-reference.md' },
<mask> {
<mask> text: 'Download',
<mask> items: [
<mask> { text: 'Open-source Edition', link: 'https://github.com/Dreamacro/clash/releases/' },
<mask> { text: 'Premium Edition', link: 'https://github.com/Dreamacro/clash/releases/tag/premium' },
</s> Docs: fix previous/next page button (#2760)
Signed-off-by: Birkhoff Lee <git@birkhoff.me> </s> remove link: doc.path.replace(/^docs/, '')
</s> add link: "/" + doc.path | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/e8b2d0ecc8ad8856345524ae3cec338caaece7ae | docs/.vitepress/config.ts |
<mask> package adapters
<mask>
<mask> import (
<mask> "fmt"
<mask> "net"
<mask> "net/http"
<mask> "net/url"
<mask> "sync"
<mask> "time"
<mask>
<mask> C "github.com/Dreamacro/clash/constant"
<mask> )
</s> Add: delay test api for proxies </s> remove url: u,
addr: addr,
</s> add </s> remove port := u.Port()
if port == "" {
if u.Scheme == "https" {
port = "443"
} else if u.Scheme == "http" {
port = "80"
} else {
return nil, fmt.Errorf("%s scheme not Support", rawURL)
}
}
addr := &C.Addr{
AddrType: C.AtypDomainName,
Host: u.Hostname(),
IP: nil,
Port: port,
}
</s> add </s> remove u, err := url.Parse(rawURL)
</s> add _, err := urlToAddr(rawURL) | [
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ea424a7694283c6dfbd5248197e2fe3ce543c290 | adapters/remote/urltest.go | |
<mask>
<mask> type URLTest struct {
<mask> name string
<mask> proxies []C.Proxy
<mask> url *url.URL
<mask> rawURL string
<mask> addr *C.Addr
<mask> fast C.Proxy
<mask> delay time.Duration
<mask> done chan struct{}
</s> Add: delay test api for proxies </s> remove addr *C.Addr
</s> add </s> remove func getUrl(proxy C.Proxy, addr *C.Addr, rawURL string) (err error) {
instance, err := proxy.Generator(addr)
if err != nil {
return
}
defer instance.Close()
transport := &http.Transport{
Dial: func(string, string) (net.Conn, error) {
return instance.Conn(), nil
},
// from http.DefaultTransport
MaxIdleConns: 100,
IdleConnTimeout: 90 * time.Second,
TLSHandshakeTimeout: 10 * time.Second,
ExpectContinueTimeout: 1 * time.Second,
}
client := http.Client{Transport: transport}
req, err := client.Get(rawURL)
if err != nil {
return
}
req.Body.Close()
return nil
}
func selectFast(in chan interface{}) chan interface{} {
out := make(chan interface{})
go func() {
p, open := <-in
if open {
out <- p
}
close(out)
for range in {
}
}()
return out
}
</s> add </s> remove u, err := url.Parse(rawURL)
</s> add _, err := urlToAddr(rawURL) </s> remove port := u.Port()
if port == "" {
if u.Scheme == "https" {
port = "443"
} else if u.Scheme == "http" {
port = "80"
} else {
return nil, fmt.Errorf("%s scheme not Support", rawURL)
}
}
addr := &C.Addr{
AddrType: C.AtypDomainName,
Host: u.Hostname(),
IP: nil,
Port: port,
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ea424a7694283c6dfbd5248197e2fe3ce543c290 | adapters/remote/urltest.go | |
<mask> name string
<mask> proxies []C.Proxy
<mask> url *url.URL
<mask> rawURL string
<mask> addr *C.Addr
<mask> fast C.Proxy
<mask> delay time.Duration
<mask> done chan struct{}
<mask> }
<mask>
</s> Add: delay test api for proxies </s> remove url *url.URL
</s> add </s> remove func getUrl(proxy C.Proxy, addr *C.Addr, rawURL string) (err error) {
instance, err := proxy.Generator(addr)
if err != nil {
return
}
defer instance.Close()
transport := &http.Transport{
Dial: func(string, string) (net.Conn, error) {
return instance.Conn(), nil
},
// from http.DefaultTransport
MaxIdleConns: 100,
IdleConnTimeout: 90 * time.Second,
TLSHandshakeTimeout: 10 * time.Second,
ExpectContinueTimeout: 1 * time.Second,
}
client := http.Client{Transport: transport}
req, err := client.Get(rawURL)
if err != nil {
return
}
req.Body.Close()
return nil
}
func selectFast(in chan interface{}) chan interface{} {
out := make(chan interface{})
go func() {
p, open := <-in
if open {
out <- p
}
close(out)
for range in {
}
}()
return out
}
</s> add </s> remove u, err := url.Parse(rawURL)
</s> add _, err := urlToAddr(rawURL) </s> remove port := u.Port()
if port == "" {
if u.Scheme == "https" {
port = "443"
} else if u.Scheme == "http" {
port = "80"
} else {
return nil, fmt.Errorf("%s scheme not Support", rawURL)
}
}
addr := &C.Addr{
AddrType: C.AtypDomainName,
Host: u.Hostname(),
IP: nil,
Port: port,
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ea424a7694283c6dfbd5248197e2fe3ce543c290 | adapters/remote/urltest.go | |
_, err := DelayTest(p, u.rawURL) | <mask> timer := time.NewTimer(u.delay)
<mask>
<mask> for _, p := range u.proxies {
<mask> go func(p C.Proxy) {
<mask> err := getUrl(p, u.addr, u.rawURL)
<mask> if err == nil {
<mask> c <- p
<mask> }
<mask> wg.Done()
<mask> }(p)
</s> Add: delay test api for proxies </s> remove func getUrl(proxy C.Proxy, addr *C.Addr, rawURL string) (err error) {
instance, err := proxy.Generator(addr)
if err != nil {
return
}
defer instance.Close()
transport := &http.Transport{
Dial: func(string, string) (net.Conn, error) {
return instance.Conn(), nil
},
// from http.DefaultTransport
MaxIdleConns: 100,
IdleConnTimeout: 90 * time.Second,
TLSHandshakeTimeout: 10 * time.Second,
ExpectContinueTimeout: 1 * time.Second,
}
client := http.Client{Transport: transport}
req, err := client.Get(rawURL)
if err != nil {
return
}
req.Body.Close()
return nil
}
func selectFast(in chan interface{}) chan interface{} {
out := make(chan interface{})
go func() {
p, open := <-in
if open {
out <- p
}
close(out)
for range in {
}
}()
return out
}
</s> add </s> remove u, err := url.Parse(rawURL)
</s> add _, err := urlToAddr(rawURL) </s> remove port := u.Port()
if port == "" {
if u.Scheme == "https" {
port = "443"
} else if u.Scheme == "http" {
port = "80"
} else {
return nil, fmt.Errorf("%s scheme not Support", rawURL)
}
}
addr := &C.Addr{
AddrType: C.AtypDomainName,
Host: u.Hostname(),
IP: nil,
Port: port,
}
</s> add </s> remove url: u,
addr: addr,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ea424a7694283c6dfbd5248197e2fe3ce543c290 | adapters/remote/urltest.go |
<mask> }
<mask> }
<mask> }
<mask>
<mask> func getUrl(proxy C.Proxy, addr *C.Addr, rawURL string) (err error) {
<mask> instance, err := proxy.Generator(addr)
<mask> if err != nil {
<mask> return
<mask> }
<mask> defer instance.Close()
<mask> transport := &http.Transport{
<mask> Dial: func(string, string) (net.Conn, error) {
<mask> return instance.Conn(), nil
<mask> },
<mask> // from http.DefaultTransport
<mask> MaxIdleConns: 100,
<mask> IdleConnTimeout: 90 * time.Second,
<mask> TLSHandshakeTimeout: 10 * time.Second,
<mask> ExpectContinueTimeout: 1 * time.Second,
<mask> }
<mask> client := http.Client{Transport: transport}
<mask> req, err := client.Get(rawURL)
<mask> if err != nil {
<mask> return
<mask> }
<mask> req.Body.Close()
<mask> return nil
<mask> }
<mask>
<mask> func selectFast(in chan interface{}) chan interface{} {
<mask> out := make(chan interface{})
<mask> go func() {
<mask> p, open := <-in
<mask> if open {
<mask> out <- p
<mask> }
<mask> close(out)
<mask> for range in {
<mask> }
<mask> }()
<mask>
<mask> return out
<mask> }
<mask>
<mask> func NewURLTest(name string, proxies []C.Proxy, rawURL string, delay time.Duration) (*URLTest, error) {
<mask> u, err := url.Parse(rawURL)
<mask> if err != nil {
<mask> return nil, err
<mask> }
</s> Add: delay test api for proxies </s> remove u, err := url.Parse(rawURL)
</s> add _, err := urlToAddr(rawURL) </s> remove err := getUrl(p, u.addr, u.rawURL)
</s> add _, err := DelayTest(p, u.rawURL) </s> remove port := u.Port()
if port == "" {
if u.Scheme == "https" {
port = "443"
} else if u.Scheme == "http" {
port = "80"
} else {
return nil, fmt.Errorf("%s scheme not Support", rawURL)
}
}
addr := &C.Addr{
AddrType: C.AtypDomainName,
Host: u.Hostname(),
IP: nil,
Port: port,
}
</s> add </s> remove url: u,
addr: addr,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/Dreamacro/clash/commit/ea424a7694283c6dfbd5248197e2fe3ce543c290 | adapters/remote/urltest.go | |
_, err := urlToAddr(rawURL) | <mask> return out
<mask> }
<mask>
<mask> func NewURLTest(name string, proxies []C.Proxy, rawURL string, delay time.Duration) (*URLTest, error) {
<mask> u, err := url.Parse(rawURL)
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> port := u.Port()
</s> Add: delay test api for proxies </s> remove func getUrl(proxy C.Proxy, addr *C.Addr, rawURL string) (err error) {
instance, err := proxy.Generator(addr)
if err != nil {
return
}
defer instance.Close()
transport := &http.Transport{
Dial: func(string, string) (net.Conn, error) {
return instance.Conn(), nil
},
// from http.DefaultTransport
MaxIdleConns: 100,
IdleConnTimeout: 90 * time.Second,
TLSHandshakeTimeout: 10 * time.Second,
ExpectContinueTimeout: 1 * time.Second,
}
client := http.Client{Transport: transport}
req, err := client.Get(rawURL)
if err != nil {
return
}
req.Body.Close()
return nil
}
func selectFast(in chan interface{}) chan interface{} {
out := make(chan interface{})
go func() {
p, open := <-in
if open {
out <- p
}
close(out)
for range in {
}
}()
return out
}
</s> add </s> remove port := u.Port()
if port == "" {
if u.Scheme == "https" {
port = "443"
} else if u.Scheme == "http" {
port = "80"
} else {
return nil, fmt.Errorf("%s scheme not Support", rawURL)
}
}
addr := &C.Addr{
AddrType: C.AtypDomainName,
Host: u.Hostname(),
IP: nil,
Port: port,
}
</s> add </s> remove err := getUrl(p, u.addr, u.rawURL)
</s> add _, err := DelayTest(p, u.rawURL) </s> remove addr *C.Addr
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ea424a7694283c6dfbd5248197e2fe3ce543c290 | adapters/remote/urltest.go |
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> port := u.Port()
<mask> if port == "" {
<mask> if u.Scheme == "https" {
<mask> port = "443"
<mask> } else if u.Scheme == "http" {
<mask> port = "80"
<mask> } else {
<mask> return nil, fmt.Errorf("%s scheme not Support", rawURL)
<mask> }
<mask> }
<mask>
<mask> addr := &C.Addr{
<mask> AddrType: C.AtypDomainName,
<mask> Host: u.Hostname(),
<mask> IP: nil,
<mask> Port: port,
<mask> }
<mask>
<mask> urlTest := &URLTest{
<mask> name: name,
<mask> proxies: proxies[:],
<mask> rawURL: rawURL,
<mask> url: u,
</s> Add: delay test api for proxies </s> remove u, err := url.Parse(rawURL)
</s> add _, err := urlToAddr(rawURL) </s> remove url: u,
addr: addr,
</s> add </s> remove func getUrl(proxy C.Proxy, addr *C.Addr, rawURL string) (err error) {
instance, err := proxy.Generator(addr)
if err != nil {
return
}
defer instance.Close()
transport := &http.Transport{
Dial: func(string, string) (net.Conn, error) {
return instance.Conn(), nil
},
// from http.DefaultTransport
MaxIdleConns: 100,
IdleConnTimeout: 90 * time.Second,
TLSHandshakeTimeout: 10 * time.Second,
ExpectContinueTimeout: 1 * time.Second,
}
client := http.Client{Transport: transport}
req, err := client.Get(rawURL)
if err != nil {
return
}
req.Body.Close()
return nil
}
func selectFast(in chan interface{}) chan interface{} {
out := make(chan interface{})
go func() {
p, open := <-in
if open {
out <- p
}
close(out)
for range in {
}
}()
return out
}
</s> add </s> remove err := getUrl(p, u.addr, u.rawURL)
</s> add _, err := DelayTest(p, u.rawURL) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"k... | https://github.com/Dreamacro/clash/commit/ea424a7694283c6dfbd5248197e2fe3ce543c290 | adapters/remote/urltest.go | |
<mask> urlTest := &URLTest{
<mask> name: name,
<mask> proxies: proxies[:],
<mask> rawURL: rawURL,
<mask> url: u,
<mask> addr: addr,
<mask> fast: proxies[0],
<mask> delay: delay,
<mask> done: make(chan struct{}),
<mask> }
<mask> go urlTest.loop()
</s> Add: delay test api for proxies </s> remove port := u.Port()
if port == "" {
if u.Scheme == "https" {
port = "443"
} else if u.Scheme == "http" {
port = "80"
} else {
return nil, fmt.Errorf("%s scheme not Support", rawURL)
}
}
addr := &C.Addr{
AddrType: C.AtypDomainName,
Host: u.Hostname(),
IP: nil,
Port: port,
}
</s> add </s> remove func getUrl(proxy C.Proxy, addr *C.Addr, rawURL string) (err error) {
instance, err := proxy.Generator(addr)
if err != nil {
return
}
defer instance.Close()
transport := &http.Transport{
Dial: func(string, string) (net.Conn, error) {
return instance.Conn(), nil
},
// from http.DefaultTransport
MaxIdleConns: 100,
IdleConnTimeout: 90 * time.Second,
TLSHandshakeTimeout: 10 * time.Second,
ExpectContinueTimeout: 1 * time.Second,
}
client := http.Client{Transport: transport}
req, err := client.Get(rawURL)
if err != nil {
return
}
req.Body.Close()
return nil
}
func selectFast(in chan interface{}) chan interface{} {
out := make(chan interface{})
go func() {
p, open := <-in
if open {
out <- p
}
close(out)
for range in {
}
}()
return out
}
</s> add </s> remove err := getUrl(p, u.addr, u.rawURL)
</s> add _, err := DelayTest(p, u.rawURL) </s> remove u, err := url.Parse(rawURL)
</s> add _, err := urlToAddr(rawURL) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ea424a7694283c6dfbd5248197e2fe3ce543c290 | adapters/remote/urltest.go | |
"strconv"
"time" | <mask> "fmt"
<mask> "net/http"
<mask>
<mask> A "github.com/Dreamacro/clash/adapters/remote"
<mask> C "github.com/Dreamacro/clash/constant"
<mask>
<mask> "github.com/go-chi/chi"
<mask> "github.com/go-chi/render"
</s> Add: delay test api for proxies </s> remove "fmt"
"net"
"net/http"
"net/url"
</s> add </s> remove url: u,
addr: addr,
</s> add </s> remove port := u.Port()
if port == "" {
if u.Scheme == "https" {
port = "443"
} else if u.Scheme == "http" {
port = "80"
} else {
return nil, fmt.Errorf("%s scheme not Support", rawURL)
}
}
addr := &C.Addr{
AddrType: C.AtypDomainName,
Host: u.Hostname(),
IP: nil,
Port: port,
}
</s> add </s> remove u, err := url.Parse(rawURL)
</s> add _, err := urlToAddr(rawURL) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ea424a7694283c6dfbd5248197e2fe3ce543c290 | hub/proxies.go |
r.Get("/{name}/delay", getProxyDelay) | <mask> func proxyRouter() http.Handler {
<mask> r := chi.NewRouter()
<mask> r.Get("/", getProxies)
<mask> r.Get("/{name}", getProxy)
<mask> r.Put("/{name}", updateProxy)
<mask> return r
<mask> }
<mask>
<mask> type SampleProxy struct {
<mask> Type string `json:"type"`
</s> Add: delay test api for proxies </s> remove url *url.URL
</s> add </s> remove func getUrl(proxy C.Proxy, addr *C.Addr, rawURL string) (err error) {
instance, err := proxy.Generator(addr)
if err != nil {
return
}
defer instance.Close()
transport := &http.Transport{
Dial: func(string, string) (net.Conn, error) {
return instance.Conn(), nil
},
// from http.DefaultTransport
MaxIdleConns: 100,
IdleConnTimeout: 90 * time.Second,
TLSHandshakeTimeout: 10 * time.Second,
ExpectContinueTimeout: 1 * time.Second,
}
client := http.Client{Transport: transport}
req, err := client.Get(rawURL)
if err != nil {
return
}
req.Body.Close()
return nil
}
func selectFast(in chan interface{}) chan interface{} {
out := make(chan interface{})
go func() {
p, open := <-in
if open {
out <- p
}
close(out)
for range in {
}
}()
return out
}
</s> add </s> remove u, err := url.Parse(rawURL)
</s> add _, err := urlToAddr(rawURL) </s> remove port := u.Port()
if port == "" {
if u.Scheme == "https" {
port = "443"
} else if u.Scheme == "http" {
port = "80"
} else {
return nil, fmt.Errorf("%s scheme not Support", rawURL)
}
}
addr := &C.Addr{
AddrType: C.AtypDomainName,
Host: u.Hostname(),
IP: nil,
Port: port,
}
</s> add </s> remove err := getUrl(p, u.addr, u.rawURL)
</s> add _, err := DelayTest(p, u.rawURL) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ea424a7694283c6dfbd5248197e2fe3ce543c290 | hub/proxies.go |
errMissProxy = errors.New("`use` or `proxies` missing") | <mask> var (
<mask> errFormat = errors.New("format error")
<mask> errType = errors.New("unsupport type")
<mask> errMissUse = errors.New("`use` field should not be empty")
<mask> errMissHealthCheck = errors.New("`url` or `interval` missing")
<mask> errDuplicateProvider = errors.New("`duplicate provider name")
<mask> )
<mask>
<mask> type GroupCommonOption struct {
</s> Fix: valid proxy group and remove unused code </s> remove
// dotPath is the URL path that should be used.
dotPath = "/dns-query"
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/eae06a4a7d3e7f47b5d442e59e944f7ba5bcc1ff | adapters/outboundgroup/parser.go |
if len(groupOption.Proxies) == 0 && len(groupOption.Use) == 0 {
return nil, errMissProxy
}
| <mask>
<mask> providers := []provider.ProxyProvider{}
<mask> if len(groupOption.Proxies) != 0 {
<mask> ps, err := getProxies(proxyMap, groupOption.Proxies)
<mask> if err != nil {
<mask> return nil, err
<mask> }
</s> Fix: valid proxy group and remove unused code </s> remove
// dotPath is the URL path that should be used.
dotPath = "/dns-query"
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/eae06a4a7d3e7f47b5d442e59e944f7ba5bcc1ff | adapters/outboundgroup/parser.go |
<mask>
<mask> const (
<mask> // dotMimeType is the DoH mimetype that should be used.
<mask> dotMimeType = "application/dns-message"
<mask>
<mask> // dotPath is the URL path that should be used.
<mask> dotPath = "/dns-query"
<mask> )
<mask>
<mask> var dohTransport = &http.Transport{
<mask> TLSClientConfig: &tls.Config{ClientSessionCache: globalSessionCache},
<mask> }
</s> Fix: valid proxy group and remove unused code | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/eae06a4a7d3e7f47b5d442e59e944f7ba5bcc1ff | dns/doh.go | |
go.uber.org/automaxprocs v1.4.0 | <mask> go.etcd.io/bbolt v1.3.6
<mask> go.uber.org/atomic v1.9.0
<mask> golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
<mask> golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f
<mask> golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
<mask> golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34
<mask> gopkg.in/yaml.v2 v2.4.0
</s> Chore: use uber max procs </s> remove gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
</s> add </s> remove if runtime.NumCPU() > numUDPWorkers {
numUDPWorkers = runtime.NumCPU()
</s> add if num := runtime.GOMAXPROCS(0); num > numUDPWorkers {
numUDPWorkers = num | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ebbc9604ce68b6484ab730a05cf02a639e619438 | go.mod |
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= | <mask> github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod h1:WGuG/smIU4J/54PblvSbh+xvCZmpJnFgr3ds6Z55XMQ=
<mask> github.com/jsimonetti/rtnetlink v0.0.0-20201009170750-9c6f07d100c1/go.mod h1:hqoO/u39cqLeBLebZ8fWdE96O7FxrAsRYhnVOdgHxok=
<mask> github.com/jsimonetti/rtnetlink v0.0.0-20201110080708-d2c240429e6c/go.mod h1:huN4d1phzjhlOsNIjFsw2SVRbwIHj3fJDMEU2SDPTmg=
<mask> github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
<mask> github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7/go.mod h1:U6ZQobyTjI/tJyq2HG+i/dfSoFUt8/aZCM+GKtmFk/Y=
<mask> github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA=
<mask> github.com/mdlayher/netlink v1.0.0/go.mod h1:KxeJAFOFLG6AjpyDkQ/iIhxygIUKD+vcwqcnu43w/+M=
<mask> github.com/mdlayher/netlink v1.1.0/go.mod h1:H4WCitaheIsdF9yOYu8CFmCgQthAPIWZmcKp9uZHgmY=
</s> Chore: use uber max procs </s> remove if runtime.NumCPU() > numUDPWorkers {
numUDPWorkers = runtime.NumCPU()
</s> add if num := runtime.GOMAXPROCS(0); num > numUDPWorkers {
numUDPWorkers = num </s> remove gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ebbc9604ce68b6484ab730a05cf02a639e619438 | go.sum |
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= | <mask> github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
<mask> github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
<mask> github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
<mask> github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
<mask> github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
<mask> github.com/u-root/uio v0.0.0-20210528114334-82958018845c h1:BFvcl34IGnw8yvJi8hlqLFo9EshRInwWBs2M5fGWzQA=
<mask> github.com/u-root/uio v0.0.0-20210528114334-82958018845c/go.mod h1:LpEX5FO/cB+WF4TYGY1V5qktpaZLkKkSegbr0V4eYXA=
</s> Chore: use uber max procs </s> remove if runtime.NumCPU() > numUDPWorkers {
numUDPWorkers = runtime.NumCPU()
</s> add if num := runtime.GOMAXPROCS(0); num > numUDPWorkers {
numUDPWorkers = num </s> remove gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ebbc9604ce68b6484ab730a05cf02a639e619438 | go.sum |
go.uber.org/automaxprocs v1.4.0 h1:CpDZl6aOlLhReez+8S3eEotD7Jx0Os++lemPlMULQP0=
go.uber.org/automaxprocs v1.4.0/go.mod h1:/mTEdr7LvHhs0v7mjdxDreTz1OG5zdZGqgOnhWiR/+Q= | <mask> go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4=
<mask> go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
<mask> go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
<mask> golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
<mask> golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
<mask> golang.org/x/crypto v0.0.0-20210317152858-513c2a44f670/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
<mask> golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ=
<mask> golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
</s> Chore: use uber max procs </s> remove if runtime.NumCPU() > numUDPWorkers {
numUDPWorkers = runtime.NumCPU()
</s> add if num := runtime.GOMAXPROCS(0); num > numUDPWorkers {
numUDPWorkers = num | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ebbc9604ce68b6484ab730a05cf02a639e619438 | go.sum |
<mask> golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
<mask> golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
<mask> golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
<mask> golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
<mask> gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
<mask> gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
<mask> gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
<mask> gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
<mask> gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
</s> Chore: use uber max procs </s> remove if runtime.NumCPU() > numUDPWorkers {
numUDPWorkers = runtime.NumCPU()
</s> add if num := runtime.GOMAXPROCS(0); num > numUDPWorkers {
numUDPWorkers = num | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ebbc9604ce68b6484ab730a05cf02a639e619438 | go.sum | |
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= | <mask> golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
<mask> golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
<mask> golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
<mask> gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
<mask> gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
<mask> gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
<mask> gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
</s> Chore: use uber max procs </s> remove gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
</s> add </s> remove if runtime.NumCPU() > numUDPWorkers {
numUDPWorkers = runtime.NumCPU()
</s> add if num := runtime.GOMAXPROCS(0); num > numUDPWorkers {
numUDPWorkers = num | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ebbc9604ce68b6484ab730a05cf02a639e619438 | go.sum |
"go.uber.org/automaxprocs/maxprocs" | <mask> "github.com/Dreamacro/clash/hub/executor"
<mask> "github.com/Dreamacro/clash/log"
<mask> )
<mask>
<mask> var (
<mask> flagset map[string]bool
<mask> version bool
</s> Chore: use uber max procs </s> remove if runtime.NumCPU() > numUDPWorkers {
numUDPWorkers = runtime.NumCPU()
</s> add if num := runtime.GOMAXPROCS(0); num > numUDPWorkers {
numUDPWorkers = num </s> remove gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ebbc9604ce68b6484ab730a05cf02a639e619438 | main.go |
maxprocs.Set(maxprocs.Logger(func(string, ...interface{}) {})) | <mask>
<mask> func main() {
<mask> if version {
<mask> fmt.Printf("Clash %s %s %s with %s %s\n", C.Version, runtime.GOOS, runtime.GOARCH, runtime.Version(), C.BuildTime)
<mask> return
<mask> }
</s> Chore: use uber max procs </s> remove if runtime.NumCPU() > numUDPWorkers {
numUDPWorkers = runtime.NumCPU()
</s> add if num := runtime.GOMAXPROCS(0); num > numUDPWorkers {
numUDPWorkers = num </s> remove gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ebbc9604ce68b6484ab730a05cf02a639e619438 | main.go |
if num := runtime.GOMAXPROCS(0); num > numUDPWorkers {
numUDPWorkers = num | <mask> }
<mask>
<mask> func process() {
<mask> numUDPWorkers := 4
<mask> if runtime.NumCPU() > numUDPWorkers {
<mask> numUDPWorkers = runtime.NumCPU()
<mask> }
<mask> for i := 0; i < numUDPWorkers; i++ {
<mask> go processUDP()
<mask> }
<mask>
</s> Chore: use uber max procs </s> remove gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ebbc9604ce68b6484ab730a05cf02a639e619438 | tunnel/tunnel.go |
"sync" | <mask> "fmt"
<mask> "net"
<mask> "strconv"
<mask>
<mask> "github.com/Dreamacro/clash/log"
<mask> "github.com/Dreamacro/clash/proxy/http"
<mask> "github.com/Dreamacro/clash/proxy/mixed"
</s> Fix: add lock for inbound proxy recreate | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ecac8eb8e5f42721e6253b154d533e2e74eb4d74 | proxy/listener.go |
// lock for recreate function
socksMux sync.Mutex
httpMux sync.Mutex
redirMux sync.Mutex
mixedMux sync.Mutex
tunMux sync.Mutex | <mask> redirUDPListener *redir.RedirUDPListener
<mask> mixedListener *mixed.MixedListener
<mask> mixedUDPLister *socks.SockUDPListener
<mask> )
<mask>
<mask> type listener interface {
<mask> Close()
</s> Fix: add lock for inbound proxy recreate | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ecac8eb8e5f42721e6253b154d533e2e74eb4d74 | proxy/listener.go |
httpMux.Lock()
defer httpMux.Unlock()
| <mask> bindAddress = host
<mask> }
<mask>
<mask> func ReCreateHTTP(port int) error {
<mask> addr := genAddr(bindAddress, port, allowLan)
<mask>
<mask> if httpListener != nil {
<mask> if httpListener.Address() == addr {
<mask> return nil
</s> Fix: add lock for inbound proxy recreate | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ecac8eb8e5f42721e6253b154d533e2e74eb4d74 | proxy/listener.go |
socksMux.Lock()
defer socksMux.Unlock()
| <mask>
<mask> func ReCreateSocks(port int) error {
<mask> addr := genAddr(bindAddress, port, allowLan)
<mask>
<mask> shouldTCPIgnore := false
<mask> shouldUDPIgnore := false
<mask>
</s> Fix: add lock for inbound proxy recreate | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ecac8eb8e5f42721e6253b154d533e2e74eb4d74 | proxy/listener.go |
redirMux.Lock()
defer redirMux.Unlock()
| <mask> return nil
<mask> }
<mask>
<mask> func ReCreateRedir(port int) error {
<mask> addr := genAddr(bindAddress, port, allowLan)
<mask>
<mask> if redirListener != nil {
<mask> if redirListener.Address() == addr {
<mask> return nil
<mask> }
</s> Fix: add lock for inbound proxy recreate | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ecac8eb8e5f42721e6253b154d533e2e74eb4d74 | proxy/listener.go |
mixedMux.Lock()
defer mixedMux.Unlock()
| <mask> return nil
<mask> }
<mask>
<mask> func ReCreateMixed(port int) error {
<mask> addr := genAddr(bindAddress, port, allowLan)
<mask>
<mask> shouldTCPIgnore := false
<mask> shouldUDPIgnore := false
</s> Fix: add lock for inbound proxy recreate | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ecac8eb8e5f42721e6253b154d533e2e74eb4d74 | proxy/listener.go |
errIPNotFound = errors.New("couldn't find ip") | <mask> "strings"
<mask> )
<mask>
<mask> var (
<mask> errIPNotFound = errors.New("cannot found ip")
<mask> errIPVersion = errors.New("ip version error")
<mask> )
<mask>
<mask> // ResolveIPv4 with a host, return ipv4
<mask> func ResolveIPv4(host string) (net.IP, error) {
</s> Chore: distinguish udp request in log (#449) </s> remove log.Warnln("dial %s error: %s", proxy.Name(), err.Error())
</s> add log.Warnln("[UDP] dial %s error: %s", proxy.Name(), err.Error()) </s> remove log.Infoln("%s --> %v match %s using %s", metadata.SrcIP.String(), metadata.String(), rule.RuleType().String(), rawPc.Chains().String())
</s> add log.Infoln("[UDP] %s --> %v match %s using %s", metadata.SrcIP.String(), metadata.String(), rule.RuleType().String(), rawPc.Chains().String()) </s> remove log.Warnln("Parse metadata failed: %s", err.Error())
</s> add log.Warnln("[UDP] Parse metadata failed: %s", err.Error()) </s> remove log.Infoln("%s --> %v doesn't match any rule using DIRECT", metadata.SrcIP.String(), metadata.String())
</s> add log.Infoln("[UDP] %s --> %v doesn't match any rule using DIRECT", metadata.SrcIP.String(), metadata.String()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ecb9e4f57db370dde2b0b9bfd28118893dd61800 | dns/iputil.go |
log.Warnln("[UDP] Parse metadata failed: %s", err.Error()) | <mask> if !loaded {
<mask> wg.Add(1)
<mask> proxy, rule, err := t.resolveMetadata(metadata)
<mask> if err != nil {
<mask> log.Warnln("Parse metadata failed: %s", err.Error())
<mask> t.natTable.Delete(lockKey)
<mask> wg.Done()
<mask> return
<mask> }
<mask>
</s> Chore: distinguish udp request in log (#449) </s> remove log.Warnln("dial %s error: %s", proxy.Name(), err.Error())
</s> add log.Warnln("[UDP] dial %s error: %s", proxy.Name(), err.Error()) </s> remove log.Infoln("%s --> %v doesn't match any rule using DIRECT", metadata.SrcIP.String(), metadata.String())
</s> add log.Infoln("[UDP] %s --> %v doesn't match any rule using DIRECT", metadata.SrcIP.String(), metadata.String()) </s> remove log.Infoln("%s --> %v match %s using %s", metadata.SrcIP.String(), metadata.String(), rule.RuleType().String(), rawPc.Chains().String())
</s> add log.Infoln("[UDP] %s --> %v match %s using %s", metadata.SrcIP.String(), metadata.String(), rule.RuleType().String(), rawPc.Chains().String()) </s> remove errIPNotFound = errors.New("cannot found ip")
</s> add errIPNotFound = errors.New("couldn't find ip") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ecb9e4f57db370dde2b0b9bfd28118893dd61800 | tunnel/tunnel.go |
log.Warnln("[UDP] dial %s error: %s", proxy.Name(), err.Error()) | <mask> }
<mask>
<mask> rawPc, nAddr, err := proxy.DialUDP(metadata)
<mask> if err != nil {
<mask> log.Warnln("dial %s error: %s", proxy.Name(), err.Error())
<mask> t.natTable.Delete(lockKey)
<mask> wg.Done()
<mask> return
<mask> }
<mask> addr = nAddr
</s> Chore: distinguish udp request in log (#449) </s> remove log.Warnln("Parse metadata failed: %s", err.Error())
</s> add log.Warnln("[UDP] Parse metadata failed: %s", err.Error()) </s> remove log.Infoln("%s --> %v match %s using %s", metadata.SrcIP.String(), metadata.String(), rule.RuleType().String(), rawPc.Chains().String())
</s> add log.Infoln("[UDP] %s --> %v match %s using %s", metadata.SrcIP.String(), metadata.String(), rule.RuleType().String(), rawPc.Chains().String()) </s> remove log.Infoln("%s --> %v doesn't match any rule using DIRECT", metadata.SrcIP.String(), metadata.String())
</s> add log.Infoln("[UDP] %s --> %v doesn't match any rule using DIRECT", metadata.SrcIP.String(), metadata.String()) </s> remove errIPNotFound = errors.New("cannot found ip")
</s> add errIPNotFound = errors.New("couldn't find ip") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ecb9e4f57db370dde2b0b9bfd28118893dd61800 | tunnel/tunnel.go |
log.Infoln("[UDP] %s --> %v match %s using %s", metadata.SrcIP.String(), metadata.String(), rule.RuleType().String(), rawPc.Chains().String()) | <mask> addr = nAddr
<mask> pc = newUDPTracker(rawPc, DefaultManager, metadata, rule)
<mask>
<mask> if rule != nil {
<mask> log.Infoln("%s --> %v match %s using %s", metadata.SrcIP.String(), metadata.String(), rule.RuleType().String(), rawPc.Chains().String())
<mask> } else {
<mask> log.Infoln("%s --> %v doesn't match any rule using DIRECT", metadata.SrcIP.String(), metadata.String())
<mask> }
<mask>
<mask> t.natTable.Set(key, pc, addr)
</s> Chore: distinguish udp request in log (#449) </s> remove log.Infoln("%s --> %v doesn't match any rule using DIRECT", metadata.SrcIP.String(), metadata.String())
</s> add log.Infoln("[UDP] %s --> %v doesn't match any rule using DIRECT", metadata.SrcIP.String(), metadata.String()) </s> remove log.Warnln("dial %s error: %s", proxy.Name(), err.Error())
</s> add log.Warnln("[UDP] dial %s error: %s", proxy.Name(), err.Error()) </s> remove log.Warnln("Parse metadata failed: %s", err.Error())
</s> add log.Warnln("[UDP] Parse metadata failed: %s", err.Error()) </s> remove errIPNotFound = errors.New("cannot found ip")
</s> add errIPNotFound = errors.New("couldn't find ip") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ecb9e4f57db370dde2b0b9bfd28118893dd61800 | tunnel/tunnel.go |
log.Infoln("[UDP] %s --> %v doesn't match any rule using DIRECT", metadata.SrcIP.String(), metadata.String()) | <mask>
<mask> if rule != nil {
<mask> log.Infoln("%s --> %v match %s using %s", metadata.SrcIP.String(), metadata.String(), rule.RuleType().String(), rawPc.Chains().String())
<mask> } else {
<mask> log.Infoln("%s --> %v doesn't match any rule using DIRECT", metadata.SrcIP.String(), metadata.String())
<mask> }
<mask>
<mask> t.natTable.Set(key, pc, addr)
<mask> t.natTable.Delete(lockKey)
<mask> wg.Done()
</s> Chore: distinguish udp request in log (#449) </s> remove log.Infoln("%s --> %v match %s using %s", metadata.SrcIP.String(), metadata.String(), rule.RuleType().String(), rawPc.Chains().String())
</s> add log.Infoln("[UDP] %s --> %v match %s using %s", metadata.SrcIP.String(), metadata.String(), rule.RuleType().String(), rawPc.Chains().String()) </s> remove log.Warnln("dial %s error: %s", proxy.Name(), err.Error())
</s> add log.Warnln("[UDP] dial %s error: %s", proxy.Name(), err.Error()) </s> remove log.Warnln("Parse metadata failed: %s", err.Error())
</s> add log.Warnln("[UDP] Parse metadata failed: %s", err.Error()) </s> remove errIPNotFound = errors.New("cannot found ip")
</s> add errIPNotFound = errors.New("couldn't find ip") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ecb9e4f57db370dde2b0b9bfd28118893dd61800 | tunnel/tunnel.go |
if _, ok := providersMap[groupName]; ok {
return nil, errDuplicateProvider
}
// select don't need health check
if groupOption.Type == "select" || groupOption.Type == "relay" { | <mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> // if Use not empty, drop health check options
<mask> if len(groupOption.Use) != 0 {
<mask> hc := provider.NewHealthCheck(ps, "", 0, true)
<mask> pd, err := provider.NewCompatibleProvider(groupName, ps, hc)
<mask> if err != nil {
<mask> return nil, err
<mask> }
</s> Fix: when both providers and proxies are present, use the health check configuration for proxies (#1821)
Co-authored-by: Ho <ho@fluidex.com> </s> remove if _, ok := providersMap[groupName]; ok {
return nil, errDuplicateProvider
</s> add if groupOption.URL == "" || groupOption.Interval == 0 {
return nil, errMissHealthCheck </s> remove // select don't need health check
if groupOption.Type == "select" || groupOption.Type == "relay" {
hc := provider.NewHealthCheck(ps, "", 0, true)
pd, err := provider.NewCompatibleProvider(groupName, ps, hc)
if err != nil {
return nil, err
}
providers = append(providers, pd)
providersMap[groupName] = pd
} else {
if groupOption.URL == "" || groupOption.Interval == 0 {
return nil, errMissHealthCheck
}
hc := provider.NewHealthCheck(ps, groupOption.URL, uint(groupOption.Interval), groupOption.Lazy)
pd, err := provider.NewCompatibleProvider(groupName, ps, hc)
if err != nil {
return nil, err
}
providers = append(providers, pd)
providersMap[groupName] = pd
</s> add hc := provider.NewHealthCheck(ps, groupOption.URL, uint(groupOption.Interval), groupOption.Lazy)
pd, err := provider.NewCompatibleProvider(groupName, ps, hc)
if err != nil {
return nil, err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ee6fc12709c7596fc2798301ba5ff9cac410828e | adapter/outboundgroup/parser.go |
providersMap[groupName] = pd | <mask> return nil, err
<mask> }
<mask>
<mask> providers = append(providers, pd)
<mask> } else {
<mask> if groupOption.URL == "" || groupOption.Interval == 0 {
<mask> return nil, errMissHealthCheck
<mask> }
<mask>
<mask> hc := provider.NewHealthCheck(ps, groupOption.URL, uint(groupOption.Interval), groupOption.Lazy)
</s> Fix: when both providers and proxies are present, use the health check configuration for proxies (#1821)
Co-authored-by: Ho <ho@fluidex.com> </s> remove // if Use not empty, drop health check options
if len(groupOption.Use) != 0 {
</s> add if _, ok := providersMap[groupName]; ok {
return nil, errDuplicateProvider
}
// select don't need health check
if groupOption.Type == "select" || groupOption.Type == "relay" { </s> remove // select don't need health check
if groupOption.Type == "select" || groupOption.Type == "relay" {
hc := provider.NewHealthCheck(ps, "", 0, true)
pd, err := provider.NewCompatibleProvider(groupName, ps, hc)
if err != nil {
return nil, err
}
providers = append(providers, pd)
providersMap[groupName] = pd
} else {
if groupOption.URL == "" || groupOption.Interval == 0 {
return nil, errMissHealthCheck
}
hc := provider.NewHealthCheck(ps, groupOption.URL, uint(groupOption.Interval), groupOption.Lazy)
pd, err := provider.NewCompatibleProvider(groupName, ps, hc)
if err != nil {
return nil, err
}
providers = append(providers, pd)
providersMap[groupName] = pd
</s> add hc := provider.NewHealthCheck(ps, groupOption.URL, uint(groupOption.Interval), groupOption.Lazy)
pd, err := provider.NewCompatibleProvider(groupName, ps, hc)
if err != nil {
return nil, err </s> remove if _, ok := providersMap[groupName]; ok {
return nil, errDuplicateProvider
</s> add if groupOption.URL == "" || groupOption.Interval == 0 {
return nil, errMissHealthCheck | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ee6fc12709c7596fc2798301ba5ff9cac410828e | adapter/outboundgroup/parser.go |
if groupOption.URL == "" || groupOption.Interval == 0 {
return nil, errMissHealthCheck | <mask> }
<mask>
<mask> providers = append(providers, pd)
<mask> } else {
<mask> if _, ok := providersMap[groupName]; ok {
<mask> return nil, errDuplicateProvider
<mask> }
<mask>
<mask> // select don't need health check
<mask> if groupOption.Type == "select" || groupOption.Type == "relay" {
<mask> hc := provider.NewHealthCheck(ps, "", 0, true)
</s> Fix: when both providers and proxies are present, use the health check configuration for proxies (#1821)
Co-authored-by: Ho <ho@fluidex.com> </s> remove // if Use not empty, drop health check options
if len(groupOption.Use) != 0 {
</s> add if _, ok := providersMap[groupName]; ok {
return nil, errDuplicateProvider
}
// select don't need health check
if groupOption.Type == "select" || groupOption.Type == "relay" { </s> remove // select don't need health check
if groupOption.Type == "select" || groupOption.Type == "relay" {
hc := provider.NewHealthCheck(ps, "", 0, true)
pd, err := provider.NewCompatibleProvider(groupName, ps, hc)
if err != nil {
return nil, err
}
providers = append(providers, pd)
providersMap[groupName] = pd
} else {
if groupOption.URL == "" || groupOption.Interval == 0 {
return nil, errMissHealthCheck
}
hc := provider.NewHealthCheck(ps, groupOption.URL, uint(groupOption.Interval), groupOption.Lazy)
pd, err := provider.NewCompatibleProvider(groupName, ps, hc)
if err != nil {
return nil, err
}
providers = append(providers, pd)
providersMap[groupName] = pd
</s> add hc := provider.NewHealthCheck(ps, groupOption.URL, uint(groupOption.Interval), groupOption.Lazy)
pd, err := provider.NewCompatibleProvider(groupName, ps, hc)
if err != nil {
return nil, err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ee6fc12709c7596fc2798301ba5ff9cac410828e | adapter/outboundgroup/parser.go |
hc := provider.NewHealthCheck(ps, groupOption.URL, uint(groupOption.Interval), groupOption.Lazy)
pd, err := provider.NewCompatibleProvider(groupName, ps, hc)
if err != nil {
return nil, err | <mask> if _, ok := providersMap[groupName]; ok {
<mask> return nil, errDuplicateProvider
<mask> }
<mask>
<mask> // select don't need health check
<mask> if groupOption.Type == "select" || groupOption.Type == "relay" {
<mask> hc := provider.NewHealthCheck(ps, "", 0, true)
<mask> pd, err := provider.NewCompatibleProvider(groupName, ps, hc)
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> providers = append(providers, pd)
<mask> providersMap[groupName] = pd
<mask> } else {
<mask> if groupOption.URL == "" || groupOption.Interval == 0 {
<mask> return nil, errMissHealthCheck
<mask> }
<mask>
<mask> hc := provider.NewHealthCheck(ps, groupOption.URL, uint(groupOption.Interval), groupOption.Lazy)
<mask> pd, err := provider.NewCompatibleProvider(groupName, ps, hc)
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> providers = append(providers, pd)
<mask> providersMap[groupName] = pd
<mask> }
<mask> }
<mask> }
<mask>
<mask> if len(groupOption.Use) != 0 {
</s> Fix: when both providers and proxies are present, use the health check configuration for proxies (#1821)
Co-authored-by: Ho <ho@fluidex.com> </s> remove if _, ok := providersMap[groupName]; ok {
return nil, errDuplicateProvider
</s> add if groupOption.URL == "" || groupOption.Interval == 0 {
return nil, errMissHealthCheck </s> remove // if Use not empty, drop health check options
if len(groupOption.Use) != 0 {
</s> add if _, ok := providersMap[groupName]; ok {
return nil, errDuplicateProvider
}
// select don't need health check
if groupOption.Type == "select" || groupOption.Type == "relay" { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/Dreamacro/clash/commit/ee6fc12709c7596fc2798301ba5ff9cac410828e | adapter/outboundgroup/parser.go |
providers = append(providers, pd)
providersMap[groupName] = pd | <mask> pd, err := provider.NewCompatibleProvider(groupName, ps, hc)
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask> }
<mask> }
<mask>
<mask> if len(groupOption.Use) != 0 {
</s> Fix: when both providers and proxies are present, use the health check configuration for proxies (#1821)
Co-authored-by: Ho <ho@fluidex.com> </s> remove if _, ok := providersMap[groupName]; ok {
return nil, errDuplicateProvider
</s> add if groupOption.URL == "" || groupOption.Interval == 0 {
return nil, errMissHealthCheck </s> remove // if Use not empty, drop health check options
if len(groupOption.Use) != 0 {
</s> add if _, ok := providersMap[groupName]; ok {
return nil, errDuplicateProvider
}
// select don't need health check
if groupOption.Type == "select" || groupOption.Type == "relay" { </s> remove // select don't need health check
if groupOption.Type == "select" || groupOption.Type == "relay" {
hc := provider.NewHealthCheck(ps, "", 0, true)
pd, err := provider.NewCompatibleProvider(groupName, ps, hc)
if err != nil {
return nil, err
}
providers = append(providers, pd)
providersMap[groupName] = pd
} else {
if groupOption.URL == "" || groupOption.Interval == 0 {
return nil, errMissHealthCheck
}
hc := provider.NewHealthCheck(ps, groupOption.URL, uint(groupOption.Interval), groupOption.Lazy)
pd, err := provider.NewCompatibleProvider(groupName, ps, hc)
if err != nil {
return nil, err
}
providers = append(providers, pd)
providersMap[groupName] = pd
</s> add hc := provider.NewHealthCheck(ps, groupOption.URL, uint(groupOption.Interval), groupOption.Lazy)
pd, err := provider.NewCompatibleProvider(groupName, ps, hc)
if err != nil {
return nil, err | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/ee6fc12709c7596fc2798301ba5ff9cac410828e | adapter/outboundgroup/parser.go |
go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
golangci-lint run --disable-all -E govet -E gofumpt -E megacheck ./... | <mask>
<mask> - name: Get dependencies, run test and static check
<mask> run: |
<mask> go test ./...
<mask> go vet ./...
<mask> go install honnef.co/go/tools/cmd/staticcheck@latest
<mask> staticcheck -- $(go list ./...)
<mask>
<mask> - name: Build
<mask> if: startsWith(github.ref, 'refs/tags/')
<mask> env:
<mask> NAME: clash
</s> Style: use gofumpt for fmt </s> remove var (
// ErrInvalidDomain means insert domain is invalid
ErrInvalidDomain = errors.New("invalid domain")
)
</s> add // ErrInvalidDomain means insert domain is invalid
var ErrInvalidDomain = errors.New("invalid domain") </s> remove var buf = &bytes.Buffer{}
</s> add buf := &bytes.Buffer{} </s> remove var (
endSignal = []byte{}
)
</s> add var endSignal = []byte{} </s> remove type hmacMethod func(key, data []byte) []byte
type hashDigestMethod func([]byte) []byte
</s> add type (
hmacMethod func(key, data []byte) []byte
hashDigestMethod func([]byte) []byte
) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f1cf7e926972e8d0a3e2042bec89f0175d987e39 | .github/workflows/go.yml |
lint:
golangci-lint run --disable-all -E govet -E gofumpt -E megacheck ./...
| <mask>
<mask> releases: $(gz_releases) $(zip_releases)
<mask> clean:
<mask> rm $(BINDIR)/*
</s> Style: use gofumpt for fmt </s> remove var (
// ModeMapping is a mapping for Mode enum
ModeMapping = map[string]TunnelMode{
Global.String(): Global,
Rule.String(): Rule,
Direct.String(): Direct,
}
)
</s> add // ModeMapping is a mapping for Mode enum
var ModeMapping = map[string]TunnelMode{
Global.String(): Global,
Rule.String(): Rule,
Direct.String(): Direct,
} </s> remove var (
// StoreSelected is a global switch for storing selected proxy to cache
StoreSelected = atomic.NewBool(true)
)
</s> add // StoreSelected is a global switch for storing selected proxy to cache
var StoreSelected = atomic.NewBool(true) </s> remove fileMode os.FileMode = 0666
dirMode os.FileMode = 0755
</s> add fileMode os.FileMode = 0o666
dirMode os.FileMode = 0o755 </s> remove var (
errVehicleType = errors.New("unsupport vehicle type")
)
</s> add var errVehicleType = errors.New("unsupport vehicle type") </s> remove var count = atomic.NewInt32(0)
</s> add count := atomic.NewInt32(0) | [
"keep",
"add",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f1cf7e926972e8d0a3e2042bec89f0175d987e39 | Makefile |
fileMode os.FileMode = 0o666
dirMode os.FileMode = 0o755 | <mask> "github.com/Dreamacro/clash/log"
<mask> )
<mask>
<mask> var (
<mask> fileMode os.FileMode = 0666
<mask> dirMode os.FileMode = 0755
<mask> )
<mask>
<mask> type parser = func([]byte) (interface{}, error)
<mask>
<mask> type fetcher struct {
</s> Style: use gofumpt for fmt </s> remove fileMode os.FileMode = 0666
</s> add fileMode os.FileMode = 0o666 </s> remove var (
endSignal = []byte{}
)
</s> add var endSignal = []byte{} </s> remove var (
defaultHeader = http.Header{
"content-type": []string{"application/grpc"},
"user-agent": []string{"grpc-go/1.36.0"},
}
)
</s> add var defaultHeader = http.Header{
"content-type": []string{"application/grpc"},
"user-agent": []string{"grpc-go/1.36.0"},
} </s> remove type hmacMethod func(key, data []byte) []byte
type hashDigestMethod func([]byte) []byte
</s> add type (
hmacMethod func(key, data []byte) []byte
hashDigestMethod func([]byte) []byte
) </s> remove var ErrIfaceNotFound = errors.New("interface not found")
var ErrAddrNotFound = errors.New("addr not found")
</s> add var (
ErrIfaceNotFound = errors.New("interface not found")
ErrAddrNotFound = errors.New("addr not found")
) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f1cf7e926972e8d0a3e2042bec89f0175d987e39 | adapter/provider/fetcher.go |
var errVehicleType = errors.New("unsupport vehicle type") | <mask> C "github.com/Dreamacro/clash/constant"
<mask> types "github.com/Dreamacro/clash/constant/provider"
<mask> )
<mask>
<mask> var (
<mask> errVehicleType = errors.New("unsupport vehicle type")
<mask> )
<mask>
<mask> type healthCheckSchema struct {
<mask> Enable bool `provider:"enable"`
<mask> URL string `provider:"url"`
<mask> Interval int `provider:"interval"`
</s> Style: use gofumpt for fmt </s> remove var (
DefaultOptions []Option
)
</s> add var DefaultOptions []Option </s> remove var decoder = NewDecoder(Option{TagName: "test"})
var weakTypeDecoder = NewDecoder(Option{TagName: "test", WeaklyTypedInput: true})
</s> add var (
decoder = NewDecoder(Option{TagName: "test"})
weakTypeDecoder = NewDecoder(Option{TagName: "test", WeaklyTypedInput: true})
) </s> remove var (
endSignal = []byte{}
)
</s> add var endSignal = []byte{} </s> remove fileMode os.FileMode = 0666
dirMode os.FileMode = 0755
</s> add fileMode os.FileMode = 0o666
dirMode os.FileMode = 0o755 </s> remove var (
defaultHeader = http.Header{
"content-type": []string{"application/grpc"},
"user-agent": []string{"grpc-go/1.36.0"},
}
)
</s> add var defaultHeader = http.Header{
"content-type": []string{"application/grpc"},
"user-agent": []string{"grpc-go/1.36.0"},
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f1cf7e926972e8d0a3e2042bec89f0175d987e39 | adapter/provider/parser.go |
count := atomic.NewInt32(0) | <mask> iter := iterator([]interface{}{1, 2, 3, 4, 5})
<mask> src := NewObservable(iter)
<mask> ch1, _ := src.Subscribe()
<mask> ch2, _ := src.Subscribe()
<mask> var count = atomic.NewInt32(0)
<mask>
<mask> var wg sync.WaitGroup
<mask> wg.Add(2)
<mask> waitCh := func(ch <-chan interface{}) {
<mask> for range ch {
</s> Style: use gofumpt for fmt </s> remove var shardCount = atomic.NewInt32(0)
</s> add shardCount := atomic.NewInt32(0) </s> remove var outputBuffer = &bytes.Buffer{}
</s> add outputBuffer := &bytes.Buffer{} </s> remove var ErrIfaceNotFound = errors.New("interface not found")
var ErrAddrNotFound = errors.New("addr not found")
</s> add var (
ErrIfaceNotFound = errors.New("interface not found")
ErrAddrNotFound = errors.New("addr not found")
) </s> remove var buf = &bytes.Buffer{}
</s> add buf := &bytes.Buffer{} </s> remove var (
mux sync.Mutex
)
</s> add var mux sync.Mutex | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f1cf7e926972e8d0a3e2042bec89f0175d987e39 | common/observable/observable_test.go |
//nolint | <mask>
<mask> //lint:ignore SA6002 ignore temporarily
<mask> alloc.buffers[bits].Put(buf)
<mask> return nil
<mask> }
<mask>
<mask> // msb return the pos of most significant bit
<mask> func msb(size int) uint16 {
</s> Style: use gofumpt for fmt </s> remove if err := os.MkdirAll(dir, 0777); err != nil {
</s> add if err := os.MkdirAll(dir, 0o777); err != nil { </s> remove var buf = &bytes.Buffer{}
</s> add buf := &bytes.Buffer{} </s> remove type SocketResolver func(network string, ip net.IP, srcPort int) (inode, uid int, err error)
type ProcessNameResolver func(inode, uid int) (name string, err error)
</s> add type (
SocketResolver func(network string, ip net.IP, srcPort int) (inode, uid int, err error)
ProcessNameResolver func(inode, uid int) (name string, err error)
) </s> remove var shardCount = atomic.NewInt32(0)
</s> add shardCount := atomic.NewInt32(0) </s> remove f, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY, 0644)
</s> add f, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY, 0o644) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f1cf7e926972e8d0a3e2042bec89f0175d987e39 | common/pool/alloc.go |
shardCount := atomic.NewInt32(0) | <mask>
<mask> func TestBasic(t *testing.T) {
<mask> single := NewSingle(time.Millisecond * 30)
<mask> foo := 0
<mask> var shardCount = atomic.NewInt32(0)
<mask> call := func() (interface{}, error) {
<mask> foo++
<mask> time.Sleep(time.Millisecond * 5)
<mask> return nil, nil
<mask> }
</s> Style: use gofumpt for fmt </s> remove var ErrIfaceNotFound = errors.New("interface not found")
var ErrAddrNotFound = errors.New("addr not found")
</s> add var (
ErrIfaceNotFound = errors.New("interface not found")
ErrAddrNotFound = errors.New("addr not found")
) </s> remove var buf = &bytes.Buffer{}
</s> add buf := &bytes.Buffer{} </s> remove var (
mux sync.Mutex
)
</s> add var mux sync.Mutex </s> remove var count = atomic.NewInt32(0)
</s> add count := atomic.NewInt32(0) </s> remove if err := os.MkdirAll(dir, 0777); err != nil {
</s> add if err := os.MkdirAll(dir, 0o777); err != nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f1cf7e926972e8d0a3e2042bec89f0175d987e39 | common/singledo/singledo_test.go |
var (
decoder = NewDecoder(Option{TagName: "test"})
weakTypeDecoder = NewDecoder(Option{TagName: "test", WeaklyTypedInput: true})
) | <mask> "reflect"
<mask> "testing"
<mask> )
<mask>
<mask> var decoder = NewDecoder(Option{TagName: "test"})
<mask> var weakTypeDecoder = NewDecoder(Option{TagName: "test", WeaklyTypedInput: true})
<mask>
<mask> type Baz struct {
<mask> Foo int `test:"foo"`
<mask> Bar string `test:"bar"`
<mask> }
</s> Style: use gofumpt for fmt </s> remove var (
errVehicleType = errors.New("unsupport vehicle type")
)
</s> add var errVehicleType = errors.New("unsupport vehicle type") </s> remove var (
DefaultOptions []Option
)
</s> add var DefaultOptions []Option </s> remove var (
defaultHeader = http.Header{
"content-type": []string{"application/grpc"},
"user-agent": []string{"grpc-go/1.36.0"},
}
)
</s> add var defaultHeader = http.Header{
"content-type": []string{"application/grpc"},
"user-agent": []string{"grpc-go/1.36.0"},
} </s> remove var (
endSignal = []byte{}
)
</s> add var endSignal = []byte{} </s> remove fileMode os.FileMode = 0666
dirMode os.FileMode = 0755
</s> add fileMode os.FileMode = 0o666
dirMode os.FileMode = 0o755 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f1cf7e926972e8d0a3e2042bec89f0175d987e39 | common/structure/structure_test.go |
var DefaultOptions []Option | <mask> package dialer
<mask>
<mask> var (
<mask> DefaultOptions []Option
<mask> )
<mask>
<mask> type config struct {
<mask> skipDefault bool
<mask> interfaceName string
<mask> addrReuse bool
</s> Style: use gofumpt for fmt </s> remove var (
errVehicleType = errors.New("unsupport vehicle type")
)
</s> add var errVehicleType = errors.New("unsupport vehicle type") </s> remove var (
endSignal = []byte{}
)
</s> add var endSignal = []byte{} </s> remove var decoder = NewDecoder(Option{TagName: "test"})
var weakTypeDecoder = NewDecoder(Option{TagName: "test", WeaklyTypedInput: true})
</s> add var (
decoder = NewDecoder(Option{TagName: "test"})
weakTypeDecoder = NewDecoder(Option{TagName: "test", WeaklyTypedInput: true})
) </s> remove fileMode os.FileMode = 0666
dirMode os.FileMode = 0755
</s> add fileMode os.FileMode = 0o666
dirMode os.FileMode = 0o755 </s> remove var (
defaultHeader = http.Header{
"content-type": []string{"application/grpc"},
"user-agent": []string{"grpc-go/1.36.0"},
}
)
</s> add var defaultHeader = http.Header{
"content-type": []string{"application/grpc"},
"user-agent": []string{"grpc-go/1.36.0"},
} | [
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f1cf7e926972e8d0a3e2042bec89f0175d987e39 | component/dialer/options.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.