proto/sdlan.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-//package message;
+package message;
 
 // 基础公共类型定义
 

proto/tun.proto

@@ -1,19 +0,0 @@
-syntax = "proto3";
-
-// 事件定义
-
-message NEMessage {
-    // 网络出口ip改变映射变化, 空字符串表示关闭
-    message ExitNodeIpChanged {
-        string ip = 1;
-    }
-
-    oneof message {
-        ExitNodeIpChanged exit_node_ip_changed = 1;
-    }
-}
-
-message NEReply {
-    int32 code = 1;
-    string message = 2;
-}

src/http_handler/network_handler.erl

@@ -46,7 +46,7 @@ handle_request("POST", "/network/exit_node_control", _, #{<<"id">> := NetworkId,
                 action = Action,
                 remark = Remark
             }},
-            case sdlan_network:command(NetworkPid, ReceiverPid, ClientId, SubCommand) of
+            case sdlan_network:command(NetworkId, ReceiverPid, ClientId, SubCommand) of
                 {error, Reason} ->
                     {ok, 200, sdlan_util:json_error(-1, Reason)};
                 {ok, Ref} ->

swift_pb.sh

@@ -1,16 +0,0 @@
-#! /bin/sh
-
-rm -rf tmp
-mkdir tmp
-cp proto/sdlan.proto tmp/sdlan_pb.proto
-cp proto/tun.proto tmp/tun_pb.proto
-
-cd tmp
-
-protoc sdlan_pb.proto --swift_out=.
-cp sdlan_pb.pb.swift SDLMessage.pb.swift
-cp SDLMessage.pb.swift /usr/local/code/macos/punchnet/Tun/Punchnet/
-
-protoc tun_pb.proto --swift_out=.
-cp tun_pb.pb.swift TunMessage.pb.swift
-cp TunMessage.pb.swift /usr/local/code/macos/punchnet/Tun/Punchnet/