Skip to content
This repository has been archived by the owner on Apr 3, 2021. It is now read-only.

Add requires for go module to vendoring .c files correctly #144

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
name: "Close stale issues"
on:
schedule:
- cron: "0 0 * * *"
- cron: "0 0 * * *"

jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: 'This issue is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 7 days'
days-before-stale: 60
days-before-close: 7
- uses: actions/stale@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: 'This issue is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 7 days'
days-before-stale: 60
days-before-close: 7
1 change: 1 addition & 0 deletions core/c/core/ipv4/require.go
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package ipv4
1 change: 1 addition & 0 deletions core/c/core/ipv6/require.go
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package ipv6
6 changes: 6 additions & 0 deletions core/c/core/require.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package core

import (
_ "github.com/eycorsican/go-tun2socks/core/c/core/ipv4"
_ "github.com/eycorsican/go-tun2socks/core/c/core/ipv6"
)
1 change: 1 addition & 0 deletions core/c/custom/arch/require.go
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package arch
3 changes: 3 additions & 0 deletions core/c/custom/require.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package custom

import _ "github.com/eycorsican/go-tun2socks/core/c/custom/arch"
1 change: 1 addition & 0 deletions core/c/include/compat/posix/arpa/require.go
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package arpa
1 change: 1 addition & 0 deletions core/c/include/compat/posix/net/require.go
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package net
7 changes: 7 additions & 0 deletions core/c/include/compat/posix/require.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package posix

import (
_ "github.com/eycorsican/go-tun2socks/core/c/include/compat/posix/arpa"
_ "github.com/eycorsican/go-tun2socks/core/c/include/compat/posix/net"
_ "github.com/eycorsican/go-tun2socks/core/c/include/compat/posix/sys"
)
1 change: 1 addition & 0 deletions core/c/include/compat/posix/sys/require.go
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package sys
6 changes: 6 additions & 0 deletions core/c/include/compat/require.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package compat

import (
_ "github.com/eycorsican/go-tun2socks/core/c/include/compat/posix"
_ "github.com/eycorsican/go-tun2socks/core/c/include/compat/stdc"
)
1 change: 1 addition & 0 deletions core/c/include/compat/stdc/require.go
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package stdc
1 change: 1 addition & 0 deletions core/c/include/lwip/apps/require.go
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package apps
1 change: 1 addition & 0 deletions core/c/include/lwip/priv/require.go
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package priv
1 change: 1 addition & 0 deletions core/c/include/lwip/prot/require.go
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package prot
7 changes: 7 additions & 0 deletions core/c/include/lwip/require.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package lwip

import (
_ "github.com/eycorsican/go-tun2socks/core/c/include/lwip/apps"
_ "github.com/eycorsican/go-tun2socks/core/c/include/lwip/priv"
_ "github.com/eycorsican/go-tun2socks/core/c/include/lwip/prot"
)
1 change: 1 addition & 0 deletions core/c/include/netif/ppp/polarssl/require.go
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package polarssl
5 changes: 5 additions & 0 deletions core/c/include/netif/ppp/require.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package ppp

import (
_ "github.com/eycorsican/go-tun2socks/core/c/include/netif/ppp/polarssl"
)
5 changes: 5 additions & 0 deletions core/c/include/netif/require.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package netif

import (
_ "github.com/eycorsican/go-tun2socks/core/c/include/netif/ppp"
)
5 changes: 5 additions & 0 deletions core/c/include/posix/require.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package posix

import (
_ "github.com/eycorsican/go-tun2socks/core/c/include/posix/sys"
)
1 change: 1 addition & 0 deletions core/c/include/posix/sys/require.go
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package sys
8 changes: 8 additions & 0 deletions core/c/include/require.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package include

import (
_ "github.com/eycorsican/go-tun2socks/core/c/include/compat"
_ "github.com/eycorsican/go-tun2socks/core/c/include/lwip"
_ "github.com/eycorsican/go-tun2socks/core/c/include/netif"
_ "github.com/eycorsican/go-tun2socks/core/c/include/posix"
)
7 changes: 7 additions & 0 deletions core/c/require.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package c

import (
_ "github.com/eycorsican/go-tun2socks/core/c/core"
_ "github.com/eycorsican/go-tun2socks/core/c/custom"
_ "github.com/eycorsican/go-tun2socks/core/c/include"
)
5 changes: 4 additions & 1 deletion core/c_core.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,7 @@ package core
#include "c/core/timeouts.c"
#include "c/core/udp.c"
*/
import "C"
import (
"C"
_ "github.com/eycorsican/go-tun2socks/core/c"
)
5 changes: 4 additions & 1 deletion core/c_core_4.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,7 @@ package core
#include "c/core/ipv4/ip4.c"
#include "c/core/ipv4/ip4_addr.c"
*/
import "C"
import (
"C"
_ "github.com/eycorsican/go-tun2socks/core/c"
)
5 changes: 4 additions & 1 deletion core/c_core_6.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,7 @@ package core
#include "c/core/ipv6/mld6.c"
#include "c/core/ipv6/nd6.c"
*/
import "C"
import (
"C"
_ "github.com/eycorsican/go-tun2socks/core/c"
)
5 changes: 4 additions & 1 deletion core/c_custom.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,7 @@ package core
#cgo CFLAGS: -I./c/custom
#include "c/custom/sys_arch.c"
*/
import "C"
import (
"C"
_ "github.com/eycorsican/go-tun2socks/core/c"
)
2 changes: 1 addition & 1 deletion proxy/socks/udp.go
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ func (h *udpHandler) connectInternal(conn core.UDPConn, dest string) error {
}

c.Write(append([]byte{5, socks5UDPAssociate, 0}, []byte{1, 0, 0, 0, 0, 0, 0}...))

// read VER REP RSV ATYP BND.ADDR BND.PORT
if _, err := io.ReadFull(c, buf[:3]); err != nil {
return err
Expand Down