Commit 8547db1c authored by David Fifield's avatar David Fifield Committed by Georg Koppen
Browse files

Bug 34043: Update snowflake to persist sessions across proxies 

This brings in changes related to
 #33745 Merge a turbotunnel branch
 #33897 Remove buffering from WebRTCPeer
 #34042 Reduce DataChannelTimeout

The new dependencies kcp-go and smux form the new inner session layer.
There's a patch to kcp-go to remove dependencies required for features
we don't use.
parent fab8c573

projects/goxnet/config

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ var: 
    use_container: 1

  go_lib: golang.org/x/net

  go_lib_install:

    - golang.org/x/net/ipv4

    - golang.org/x/net/ipv6

    - golang.org/x/net/proxy

    - golang.org/x/net/dns/dnsmessage

  go_lib_deps:

projects/kcp-go/config

0 → 100644
+24 −0
Original line number Diff line number Diff line 
version: '[% c("abbrev") %]'

git_url: https://github.com/xtaci/kcp-go

git_hash: 831b5b267373f6fbd3548849a3925c4e70806de2 # v5.5.11

filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'



build: '[% c("projects/go/var/build_go_lib") %]'



var:

  container:

    use_container: 1

  go_lib: github.com/xtaci/kcp-go

  go_lib_deps:

    - goerrors

    - goxnet



input_files:

  - project: container-image

  - name: go

    project: go

  - name: goerrors

    project: goerrors

  - name: goxnet

    project: goxnet

  - filename: remove-crypt-fec.patch

projects/kcp-go/remove-crypt-fec.patch

0 → 100644
+1019 −0

File added.

Preview size limit exceeded, changes collapsed.

projects/smux/config

0 → 100644
+16 −0
Original line number Diff line number Diff line 
version: '[% c("abbrev") %]'

git_url: https://github.com/xtaci/smux

git_hash: c6969d8a76874342611f4b544d05b1590f1a76b1 # v1.5.12

filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'



build: '[% c("projects/go/var/build_go_lib") %]'



var:

  container:

    use_container: 1

  go_lib: github.com/xtaci/smux



input_files:

  - project: container-image

  - name: go

    project: go

projects/snowflake/build

+3 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ mkdir -p $PTDIR $DOCSDIR 
tar -C /var/tmp/dist -xf [% c('input_files_by_name/uniuri') %]

tar -C /var/tmp/dist -xf [% c('input_files_by_name/goptlib') %]

tar -C /var/tmp/dist -xf [% c('input_files_by_name/pion-webrtc') %]

tar -C /var/tmp/dist -xf [% c('input_files_by_name/kcp-go') %]

tar -C /var/tmp/dist -xf [% c('input_files_by_name/smux') %]



mkdir -p /var/tmp/build

tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
@@ -18,6 +20,7 @@ ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/snowflake.git 
# Fix gopath location of versioned dependencies

ln -sf "$GOPATH/src/github.com/pion/webrtc" "$GOPATH/src/github.com/pion/webrtc/v2"

ln -sf "$GOPATH/src/github.com/pion/sdp" "$GOPATH/src/github.com/pion/sdp/v2"

ln -sf "$GOPATH/src/github.com/xtaci/kcp-go" "$GOPATH/src/github.com/xtaci/kcp-go/v5"



cd client

go build -ldflags '-s'