Commit de43d87a authored by ginuerzh's avatar ginuerzh

rm shadowstream used in tuntap

parent 2c0eb8df
...@@ -19,8 +19,7 @@ jobs: ...@@ -19,8 +19,7 @@ jobs:
echo ::set-output name=version::snapshot echo ::set-output name=version::snapshot
fi fi
echo ::set-output name=build_date::$(date -u +'%Y-%m-%dT%H:%M:%SZ') echo ::set-output name=docker_platforms::linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/386
echo ::set-output name=docker_platforms::linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/386
echo ::set-output name=docker_image::${{ secrets.DOCKER_USERNAME }}/${{ github.event.repository.name }} echo ::set-output name=docker_image::${{ secrets.DOCKER_USERNAME }}/${{ github.event.repository.name }}
# https://github.com/crazy-max/ghaction-docker-buildx # https://github.com/crazy-max/ghaction-docker-buildx
...@@ -36,7 +35,6 @@ jobs: ...@@ -36,7 +35,6 @@ jobs:
echo git_ref=$GITHUB_REF echo git_ref=$GITHUB_REF
echo git_sha=$GITHUB_SHA echo git_sha=$GITHUB_SHA
echo version=${{ steps.prepare.outputs.version }} echo version=${{ steps.prepare.outputs.version }}
echo date=${{ steps.prepare.outputs.build_date }}
echo image=${{ steps.prepare.outputs.docker_image }} echo image=${{ steps.prepare.outputs.docker_image }}
echo platforms=${{ steps.prepare.outputs.docker_platforms }} echo platforms=${{ steps.prepare.outputs.docker_platforms }}
echo avail_platforms=${{ steps.buildx.outputs.platforms }} echo avail_platforms=${{ steps.buildx.outputs.platforms }}
...@@ -50,9 +48,6 @@ jobs: ...@@ -50,9 +48,6 @@ jobs:
docker buildx bake \ docker buildx bake \
--set ${{ github.event.repository.name }}.platform=${{ steps.prepare.outputs.docker_platforms }} \ --set ${{ github.event.repository.name }}.platform=${{ steps.prepare.outputs.docker_platforms }} \
--set ${{ github.event.repository.name }}.output=type=image,push=false \ --set ${{ github.event.repository.name }}.output=type=image,push=false \
--set ${{ github.event.repository.name }}.args.VERSION=${{ steps.prepare.outputs.version }} \
--set ${{ github.event.repository.name }}.args.BUILD_DATE=${{ steps.prepare.outputs.build_date }} \
--set ${{ github.event.repository.name }}.args.VCS_REF=${GITHUB_SHA::8} \
--set ${{ github.event.repository.name }}.tags="${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }}" \ --set ${{ github.event.repository.name }}.tags="${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }}" \
--file docker-compose.yaml --file docker-compose.yaml
...@@ -69,9 +64,6 @@ jobs: ...@@ -69,9 +64,6 @@ jobs:
docker buildx bake \ docker buildx bake \
--set ${{ github.event.repository.name }}.platform=${{ steps.prepare.outputs.docker_platforms }} \ --set ${{ github.event.repository.name }}.platform=${{ steps.prepare.outputs.docker_platforms }} \
--set ${{ github.event.repository.name }}.output=type=image,push=true \ --set ${{ github.event.repository.name }}.output=type=image,push=true \
--set ${{ github.event.repository.name }}.args.VERSION=${{ steps.prepare.outputs.version }} \
--set ${{ github.event.repository.name }}.args.BUILD_DATE=${{ steps.prepare.outputs.build_date }} \
--set ${{ github.event.repository.name }}.args.VCS_REF=${GITHUB_SHA::8} \
--set ${{ github.event.repository.name }}.tags="${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }}" \ --set ${{ github.event.repository.name }}.tags="${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }}" \
--file docker-compose.yaml --file docker-compose.yaml
......
This diff is collapsed.
...@@ -13,7 +13,6 @@ import ( ...@@ -13,7 +13,6 @@ import (
"github.com/go-log/log" "github.com/go-log/log"
"github.com/shadowsocks/go-shadowsocks2/core" "github.com/shadowsocks/go-shadowsocks2/core"
"github.com/shadowsocks/go-shadowsocks2/shadowaead" "github.com/shadowsocks/go-shadowsocks2/shadowaead"
"github.com/shadowsocks/go-shadowsocks2/shadowstream"
"github.com/songgao/water" "github.com/songgao/water"
"github.com/songgao/water/waterutil" "github.com/songgao/water/waterutil"
"github.com/xtaci/tcpraw" "github.com/xtaci/tcpraw"
...@@ -340,7 +339,7 @@ func (h *tunHandler) transportTun(tun net.Conn, conn net.PacketConn, raddr net.A ...@@ -340,7 +339,7 @@ func (h *tunHandler) transportTun(tun net.Conn, conn net.PacketConn, raddr net.A
n, addr, err := conn.ReadFrom(b) n, addr, err := conn.ReadFrom(b)
if err != nil && if err != nil &&
err != shadowaead.ErrShortPacket && err != shadowstream.ErrShortPacket { err != shadowaead.ErrShortPacket {
return err return err
} }
...@@ -702,7 +701,7 @@ func (h *tapHandler) transportTap(tap net.Conn, conn net.PacketConn, raddr net.A ...@@ -702,7 +701,7 @@ func (h *tapHandler) transportTap(tap net.Conn, conn net.PacketConn, raddr net.A
n, addr, err := conn.ReadFrom(b) n, addr, err := conn.ReadFrom(b)
if err != nil && if err != nil &&
err != shadowaead.ErrShortPacket && err != shadowstream.ErrShortPacket { err != shadowaead.ErrShortPacket {
return err return err
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment