Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

修改为sql数据库 #45

Merged
merged 13 commits into from
Jul 22, 2021
Merged

修改为sql数据库 #45

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
884f41d
修改为sql数据库
bjdgyc Jul 15, 2021
e7ef29c
修改为sql数据库
bjdgyc Jul 16, 2021
a8038f8
修复没有ipv6报错的问题
bjdgyc Jul 16, 2021
5ffea23
修复没有ipv6报错的问题
bjdgyc Jul 16, 2021
ea4dda0
修复没有ipv6报错的问题
bjdgyc Jul 17, 2021
8ff7762
优化byte内存池
bjdgyc Jul 19, 2021
e4f959c
修改数据库表
bjdgyc Jul 19, 2021
1940fcc
修改数据库表定义
bjdgyc Jul 19, 2021
2ad6503
修改数据表字段类型
bjdgyc Jul 20, 2021
712f579
优化pool
bjdgyc Jul 20, 2021
88a3d35
修改表结构
bjdgyc Jul 21, 2021
35c6d80
修复配置文件默认值
bjdgyc Jul 21, 2021
eec3006
修复freeotp扫码问题
bjdgyc Jul 22, 2021
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
Prev Previous commit
Next Next commit
修复没有ipv6报错的问题
  • Loading branch information
@bjdgyc
bjdgyc committed Jul 16, 2021
commit a8038f8fe9a7fbe7225051b27b4d7729a63140c1
6 changes: 3 additions & 3 deletions server/handler/link_tap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ func LinkTap(cSess *sessdata.ConnSession) error {

// arp on
cmdstr1 := fmt.Sprintf("ip link set dev %s up mtu %d multicast on", ifce.Name(), cSess.Mtu)
cmdstr2 := fmt.Sprintf("sysctl -w net.ipv6.conf.%s.disable_ipv6=1", ifce.Name())
cmdstr3 := fmt.Sprintf("ip link set dev %s master %s", ifce.Name(), bridgeName)
cmdStrs := []string{cmdstr1, cmdstr2, cmdstr3}
cmdstr2 := fmt.Sprintf("ip link set dev %s master %s", ifce.Name(), bridgeName)
// cmdstr3 := fmt.Sprintf("sysctl -w net.ipv6.conf.%s.disable_ipv6=1", ifce.Name())
cmdStrs := []string{cmdstr1, cmdstr2}
err = execCmd(cmdStrs)
if err != nil {
base.Error(err)
Expand Down
4 changes: 2 additions & 2 deletions server/handler/link_tun.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ func LinkTun(cSess *sessdata.ConnSession) error {
cmdstr1 := fmt.Sprintf("ip link set dev %s up mtu %d multicast off", ifce.Name(), cSess.Mtu)
cmdstr2 := fmt.Sprintf("ip addr add dev %s local %s peer %s/32",
ifce.Name(), base.Cfg.Ipv4Gateway, cSess.IpAddr)
cmdstr3 := fmt.Sprintf("sysctl -w net.ipv6.conf.%s.disable_ipv6=1", ifce.Name())
cmdStrs := []string{cmdstr1, cmdstr2, cmdstr3}
// cmdstr3 := fmt.Sprintf("sysctl -w net.ipv6.conf.%s.disable_ipv6=1", ifce.Name())
cmdStrs := []string{cmdstr1, cmdstr2}
err = execCmd(cmdStrs)
if err != nil {
base.Error(err)
Expand Down