Skip to content

Commit

Permalink
v1.3.210109
Browse files Browse the repository at this point in the history
  • Loading branch information
aztecrabbit committed Jan 9, 2021
1 parent 492a575 commit 4a6a808
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 8 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ Configurations
--------------

Run `./brainfuck-psiphon-pro-go` first to export all default settings.
Config will generated to `config.json` where `brainfuck-psiphon-pro-go` binary file are executed.
Config will generated to `config.json` where `brainfuck-psiphon-pro-go` binary file are executed. or in linux
`~/.config/brainfuck-psiphon-pro-go`


### Pro Version
Expand Down Expand Up @@ -185,4 +186,3 @@ Note
----

- Use [bugscanner](https://github.com/aztecrabbit/bugscanner) to scan bugs for brainfuck psiphon pro go

2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
const (
appName = "Brainfuck Tunnel"
appVersionName = "Psiphon Pro Go"
appVersionCode = "1.3.200619"
appVersionCode = "1.3.210109"

copyrightYear = "2020"
copyrightAuthor = "Aztec Rabbit"
Expand Down
9 changes: 4 additions & 5 deletions src/libpsiphon/libpsiphon.go
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ func (p *Psiphon) Start() {
MigrateDataStoreDirectory: ConfigPathPsiphon + "/data/" + strconv.Itoa(p.ListenPort),
UpstreamProxyURL: "http://127.0.0.1:" + p.ProxyPort,
LocalSocksProxyPort: p.ListenPort,
SponsorId: "0000000000000000",
PropagationChannelId: "0000000000000000",
SponsorId: "00000000000000FF",
PropagationChannelId: "00000000000000FF",
EmitBytesTransferred: true,
EmitDiagnosticNotices: true,
DisableLocalHTTPProxy: true,
Expand Down Expand Up @@ -206,7 +206,7 @@ func (p *Psiphon) Start() {
p.LogInfo("Connected", liblog.Colors["Y1"])
}

} else if noticeType == "Alert" {
} else if noticeType == "Alert" || noticeType == "Warning" {
message := line["data"].(map[string]interface{})["message"].(string)

if strings.HasPrefix(message, "Config migration:") {
Expand All @@ -220,7 +220,7 @@ func (p *Psiphon) Start() {
break
}
} else if strings.Contains(message, "controller shutdown due to component failure") ||
strings.Contains(message, "psiphon.(*ServerContext).DoStatusRequest") ||
strings.Contains(message, "psiphon.(*ServerContext).DoConnectedRequest") ||
strings.Contains(message, "psiphon.(*Tunnel).sendSshKeepAlive") ||
strings.Contains(message, "psiphon.(*Tunnel).Activate") ||
strings.Contains(message, "underlying conn is closed") ||
Expand All @@ -233,7 +233,6 @@ func (p *Psiphon) Start() {
strings.Contains(message, "HandleServerRequest for psiphon-alert failed") ||
strings.Contains(message, "SOCKS proxy accept error: socks5ReadCommand:") ||
strings.Contains(message, "tunnel.dialTunnel: dialConn is not a Closer") ||
strings.Contains(message, "psiphon.(*ServerContext).DoConnectedRequest") ||
strings.Contains(message, "making proxy request: unexpected EOF") ||
strings.Contains(message, "psiphon.(*MeekConn).readPayload") ||
strings.Contains(message, "response status: 403 Forbidden") ||
Expand Down
Binary file modified storage/psiphon/database/psiphon.boltdb
Binary file not shown.

0 comments on commit 4a6a808

Please sign in to comment.