fea: discard l2tp, esp, and fabric support.

luscis · Jun 7, 2024 · 0fc0ee6 · 0fc0ee6
1 parent f2f6323
commit 0fc0ee6
Show file tree

Hide file tree

Showing 47 changed files with 58 additions and 3,238 deletions.
diff --git a/Makefile b/Makefile
@@ -101,7 +101,6 @@ docker-compose: ## create a compose files
 	echo "$ docker-compose up -d"
 
 linux: env ## build linux binary
-	go build -mod=vendor -ldflags "$(LDFLAGS)" -o $(BD)/openudp ./cmd/openudp
 	go build -mod=vendor -ldflags "$(LDFLAGS)" -o $(BD)/openlan ./cmd/main.go
 	go build -mod=vendor -ldflags "$(LDFLAGS)" -o $(BD)/openlan-proxy ./cmd/proxy
 	go build -mod=vendor -ldflags "$(LDFLAGS)" -o $(BD)/openlan-point ./cmd/point_linux
@@ -128,8 +127,8 @@ install: env linux ## install packages
 	@cp -rf $(SD)/dist/cert/openlan/ca/ca.crt $(LIN_DIR)/var/openlan/cert
 	@cp -rf $(SD)/pkg/public $(LIN_DIR)/var/openlan
 	@mkdir -p $(LIN_DIR)/usr/bin
-	@cp -rf $(BD)/{openudp,openlan} $(LIN_DIR)/usr/bin
-	@cp -rf $(BD)/{openlan-point,openlan-proxy,openlan-switch} $(LIN_DIR)/usr/bin
+	@cp -rf $(BD)/{openlan,openlan-switch} $(LIN_DIR)/usr/bin
+	@cp -rf $(BD)/{openlan-point,openlan-proxy} $(LIN_DIR)/usr/bin
 	@echo "Installed to $(LIN_DIR)"
 
 ## cross build for windows

diff --git a/README.cn.md b/README.cn.md
@@ -67,65 +67,10 @@ OpenLAN提供一种局域网数据报文在广域网的传输实现，并能够
             OpenLAN                  OpenLAN                     OpenLAN
         192.168.1.11/24           192.168.1.12/24             192.168.1.13/24
 
-### 数据中心全互联网络
-
-* Underlay for VxLAN over Internet by IPSec.
-
-                             47.example.com
-                                    |
-                                    |
-                                    |
-                                +-------+
-                                | vps-47|  -- 100.65.0.117
-                                +-------+
-                                  /   \
-                                /       \
-         SPI-117118           /           \         SPI-117119
-                            /               \
-                          /                   \
-                    +-------+                +-------+
-                    | vps-92| -------------- | vps-12|
-                    +-------+                +-------+
-                    /   |                       |  \ 
-                   /    |    SPI-118119         |   \
-      100.65.0.118      |                       |    100.65.0.119
-                        |                       |
-                  92.example.com          12.example.com
-                                        
-                                        
-
-* DCI Subnet: 192.168.x.x over IPSec Network: 100.65.0.x.
-
-                                  100.65.0.117
-                                        |
-                       eth1.200 ---     |    --- eth1.100
-                                     \  |  /
-                                    +--------+
-                                    | vps-47 |
-                                    +--------+
-                                      /   \
-                                    /       \                   
-                                  /           \                 
-                                /               \
-        enp2s4.100 ---        /                   \        --- eth4.30
-                       \    /                       \     /
-                       +--------+                 +--------+
-                       | vps-92 | --------------- | vps-12 |
-                       +--------+                 +--------+
-                        /    |                      |   \
-        enp2s4.101 ---       |                      |     --- eth4.200
-                             |                      |
-                      100.65.0.118            100.65.0.119
-       
-       VNI-1023 192.168.30.0/24 [vps-47_eth1.100, vps-92_enp2s4.100, vps-12_eth4.30]
-       VNI-1024 192.168.40.0/24 [vps-47_eth1.200, vps-92_enp2s4.101, vps-12_eth4.200]
-
 
 ## 帮助文档
 - [软件安装](docs/install.md)
 - [分支接入](docs/central.md)
 - [多区域互联](docs/multiarea.md)
-- [全互连网络](docs/fabric.md)
-- [IPSec网络](docs/ipsec.md)
 - [零信任网络](docs/ztrust.md)
 - [Docker Compose](docs/docker.md)
diff --git a/README.en.md b/README.en.md
@@ -65,64 +65,9 @@ If you have more flexible VPN business needs and need to use VPN to access the e
         192.168.1.11/24           192.168.1.12/24             192.168.1.13/24
 
 
-### Data Center Full Internet
-
-* Underlay for VxLAN over Internet by IPSec.
-
-                             47.example.com
-                                    |
-                                    |
-                                    |
-                                +-------+
-                                | vps-47|  -- 100.65.0.117
-                                +-------+
-                                  /   \
-                                /       \
-         SPI-117118           /           \         SPI-117119
-                            /               \
-                          /                   \
-                    +-------+                +-------+
-                    | vps-92| -------------- | vps-12|
-                    +-------+                +-------+
-                    /   |                       |  \ 
-                   /    |    SPI-118119         |   \
-      100.65.0.118      |                       |    100.65.0.119
-                        |                       |
-                  92.example.com          12.example.com
-                                        
-                                        
-
-* DCI Subnet: 192.168.x.x over IPSec Network: 100.65.0.x.
-
-                                  100.65.0.117
-                                        |
-                       eth1.200 ---     |    --- eth1.100
-                                     \  |  /
-                                    +--------+
-                                    | vps-47 |
-                                    +--------+
-                                      /   \
-                                    /       \                   
-                                  /           \                 
-                                /               \
-        enp2s4.100 ---        /                   \        --- eth4.30
-                       \    /                       \     /
-                       +--------+                 +--------+
-                       | vps-92 | --------------- | vps-12 |
-                       +--------+                 +--------+
-                        /    |                      |   \
-        enp2s4.101 ---       |                      |     --- eth4.200
-                             |                      |
-                      100.65.0.118            100.65.0.119
-       
-       VNI-1023 192.168.30.0/24 [vps-47_eth1.100, vps-92_enp2s4.100, vps-12_eth4.30]
-       VNI-1024 192.168.40.0/24 [vps-47_eth1.200, vps-92_enp2s4.101, vps-12_eth4.200]
-
 ## Help documents
 - [Software Installation](docs/install.md)
 - [Branch Access](docs/central.md)
 - [Multi-region Interconnection](docs/multiarea.md)
-- [Fullly Interconnected Network](docs/fabric.md)
-- [IPSec Network](docs/ipsec.md)
 - [Zero Trust Network](docs/ztrust.md)
 - [Docker Compose](docs/docker.md)
diff --git a/cmd/api/v5/cmd.go b/cmd/api/v5/cmd.go
@@ -39,10 +39,7 @@ func Commands(app *api.App) {
 	Server{}.Commands(app)
 	Network{}.Commands(app)
 	PProf{}.Commands(app)
-	Esp{}.Commands(app)
 	VxLAN{}.Commands(app)
-	State{}.Commands(app)
-	Policy{}.Commands(app)
 	Version{}.Commands(app)
 	Log{}.Commands(app)
 	Guest{}.Commands(app)

diff --git a/cmd/api/v5/ipsec.go b/cmd/api/v5/ipsec.go
diff --git a/cmd/api/v5/policy.go b/cmd/api/v5/policy.go
diff --git a/cmd/api/v5/state.go b/cmd/api/v5/state.go