diff --git a/LICENSE b/LICENSE index 401d523..5ff4cad 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2019 AICells +Copyright (c) 2021 AICells Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/include/eNet.hrl b/include/eNet.hrl index bec792c..b048f64 100644 --- a/include/eNet.hrl +++ b/include/eNet.hrl @@ -4,8 +4,8 @@ -define(miSockReady, miSockReady). --define(WARN(Tag, Format, Data), nlNetCom:warnMsg(Tag, Format, Data)). --define(getListValue(Key, List, Default), nlNetCom:getListValue(Key, List, Default)). +-define(WARN(Tag, Format, Data), ntNetCom:warnMsg(Tag, Format, Data)). +-define(getListValue(Key, List, Default), ntNetCom:getListValue(Key, List, Default)). -define(SSL_CLOSE_TIMEOUT, 5000). -define(SSL_HANDSHAKE_TIMEOUT, 15000). diff --git a/rebar.config b/rebar.config index 3751947..a29e33b 100644 --- a/rebar.config +++ b/rebar.config @@ -1,5 +1,14 @@ -{erl_opts, [{i, "include"}, warn_unused_vars, warn_shadow_vars, warn_unused_import, warn_obsolete_guard, debug_info]}. +{erl_opts, [ + debug_info + , {i, "include"} + , warn_unused_vars + , warn_shadow_vars + , warn_unused_import + , warn_obsolete_guard +]}. + {deps, [ + {eGbh, ".*", {git, "http://sismaker.tpddns.cn:53000/SisMaker/eGbh.git", {branch, "master"}}}, {eSync, ".*", {git, "http://sismaker.tpddns.cn:53000/SisMaker/eSync.git", {branch, "master"}}} ]}. diff --git a/src/eNet.app.src b/src/eNet.app.src index bd2fe38..9b61126 100644 --- a/src/eNet.app.src +++ b/src/eNet.app.src @@ -1,12 +1,12 @@ {application, eNet, [{description, "An OTP application"}, - {vsn, "0.1.0"}, - {registered, []}, - {mod, {eNet_app, []}}, - {applications, - [kernel, stdlib]}, - {env,[]}, - {modules, []}, - {licenses, ["Apache 2.0"]}, - {links, []} + {vsn, "0.1.0"}, + {registered, []}, + {mod, {eNet_app, []}}, + {applications, [kernel, stdlib]}, + {env, []}, + {modules, []}, + + {licenses, ["MIT"]}, + {links, []} ]}. diff --git a/src/eNet.erl b/src/eNet.erl index 5d958b6..b74f721 100644 --- a/src/eNet.erl +++ b/src/eNet.erl @@ -41,16 +41,16 @@ addTcpLr(ListenName, AddrPort, ConMod, ListenOpt) -> _ -> ignore end, - FixAddrPort = nlNetCom:fixAddr(AddrPort), + FixAddrPort = ntNetCom:fixAddr(AddrPort), TcpListenSpec = #{ id => ListenName, - start => {nlTcpListener, start_link, [ListenName, FixAddrPort, ConMod, ListenOpt]}, + start => {ntTcpListener, start_link, [ListenName, FixAddrPort, ConMod, ListenOpt]}, restart => transient, shutdown => 5000, type => worker, modules => [nlTcpListener] }, - nlTcpMgrSup:startChild(TcpListenSpec). + ntTcpMgrSup:startChild(TcpListenSpec). %% stop a TCP listener -spec stopTcpLr(listenName()) -> ignore | {ok, pid()} | {error, term()}. @@ -59,6 +59,6 @@ stopTcpLr(ListenName) -> undefined -> ignore; _ -> - nlTcpMgrSup:terminateChild(ListenName), - nlTcpMgrSup:deleteChild(ListenName) + ntTcpMgrSup:terminateChild(ListenName), + ntTcpMgrSup:deleteChild(ListenName) end. diff --git a/src/eNet_sup.erl b/src/eNet_sup.erl index 47c1fb4..b1eedfb 100644 --- a/src/eNet_sup.erl +++ b/src/eNet_sup.erl @@ -11,16 +11,6 @@ start_link() -> supervisor:start_link({local, ?MODULE}, ?MODULE, []). -%% sup_flags() = #{strategy => strategy(), % optional -%% intensity => non_neg_integer(), % optional -%% period => pos_integer()} % optional -%% child_spec() = #{id => child_id(), % mandatory -%% start => mfargs(), % mandatory -%% restart => restart(), % optional -%% shutdown => shutdown(), % optional -%% type => worker(), % optional -%% modules => modules()} % optional - init([]) -> SupFlag = #{strategy => one_for_one, intensity => 1000, period => 3600}, {ok, {SupFlag, []}}. diff --git a/src/comMod/erlang套接字编程和性能优化.md b/src/misc/erlang套接字编程和性能优化.md similarity index 100% rename from src/comMod/erlang套接字编程和性能优化.md rename to src/misc/erlang套接字编程和性能优化.md diff --git a/src/comMod/nlAccess.erl b/src/misc/ntAccess.erl similarity index 99% rename from src/comMod/nlAccess.erl rename to src/misc/ntAccess.erl index bb2a6d3..24303d8 100644 --- a/src/comMod/nlAccess.erl +++ b/src/misc/ntAccess.erl @@ -14,7 +14,7 @@ %% limitations under the License. %%-------------------------------------------------------------------- --module(nlAccess). +-module(ntAccess). -type(rule() :: {allow, all} | {allow, string()} | {deny, all} | {deny, string()}). diff --git a/src/comMod/nlCidr.erl b/src/misc/ntCidr.erl similarity index 98% rename from src/comMod/nlCidr.erl rename to src/misc/ntCidr.erl index a647559..97645d4 100644 --- a/src/comMod/nlCidr.erl +++ b/src/misc/ntCidr.erl @@ -1,4 +1,4 @@ --module(nlCidr). +-module(ntCidr). -export([ parse/1 diff --git a/src/comMod/nlNetCom.erl b/src/misc/ntNetCom.erl similarity index 99% rename from src/comMod/nlNetCom.erl rename to src/misc/ntNetCom.erl index 9a3ffeb..99e487b 100644 --- a/src/comMod/nlNetCom.erl +++ b/src/misc/ntNetCom.erl @@ -1,4 +1,4 @@ --module(nlNetCom). +-module(ntNetCom). -compile([export_all]). diff --git a/src/comMod/nlTokenBucket.erl b/src/misc/ntTokenBucket.erl similarity index 99% rename from src/comMod/nlTokenBucket.erl rename to src/misc/ntTokenBucket.erl index 2baba53..4a870f5 100644 --- a/src/comMod/nlTokenBucket.erl +++ b/src/misc/ntTokenBucket.erl @@ -13,7 +13,7 @@ %% 这两种算法的主要区别在于“漏桶算法”能够强行限制数据的传输速率, %% 而“令牌桶算法”在能够限制数据的平均传输数据外,还允许某种程度的突发传输。 %% 在“令牌桶算法”中,只要令牌桶中存在令牌,那么就允许突发地传输数据直到达到用户配置的门限,因此它适合于具有突发特性的流量。 --module(nlTokenBucket). +-module(ntTokenBucket). -include("eNet.hrl"). -export([ diff --git a/src/sslMod/doToSsl.md b/src/ssl/doToSsl.md similarity index 100% rename from src/sslMod/doToSsl.md rename to src/ssl/doToSsl.md diff --git a/src/tcpMod/echo_client.erl b/src/tcp/echo_client.erl similarity index 100% rename from src/tcpMod/echo_client.erl rename to src/tcp/echo_client.erl diff --git a/src/tcpMod/echo_server.erl b/src/tcp/echo_server.erl similarity index 100% rename from src/tcpMod/echo_server.erl rename to src/tcp/echo_server.erl diff --git a/src/tcpMod/nlTcpAcceptor.erl b/src/tcp/ntTcpAcceptor.erl similarity index 99% rename from src/tcpMod/nlTcpAcceptor.erl rename to src/tcp/ntTcpAcceptor.erl index 0c575a4..64527d6 100644 --- a/src/tcpMod/nlTcpAcceptor.erl +++ b/src/tcp/ntTcpAcceptor.erl @@ -1,4 +1,4 @@ --module(nlTcpAcceptor). +-module(ntTcpAcceptor). -include("eNet.hrl"). -compile(inline). -compile({inline_size, 128}). diff --git a/src/tcpMod/nlTcpAcceptorSup.erl b/src/tcp/ntTcpAcceptorSup.erl similarity index 96% rename from src/tcpMod/nlTcpAcceptorSup.erl rename to src/tcp/ntTcpAcceptorSup.erl index 3d07953..f362cf7 100644 --- a/src/tcpMod/nlTcpAcceptorSup.erl +++ b/src/tcp/ntTcpAcceptorSup.erl @@ -1,4 +1,4 @@ --module(nlTcpAcceptorSup). +-module(ntTcpAcceptorSup). -behaviour(supervisor). diff --git a/src/tcpMod/nlTcpListener.erl b/src/tcp/ntTcpListener.erl similarity index 96% rename from src/tcpMod/nlTcpListener.erl rename to src/tcp/ntTcpListener.erl index 2eb1ed3..d57940d 100644 --- a/src/tcpMod/nlTcpListener.erl +++ b/src/tcp/ntTcpListener.erl @@ -1,4 +1,4 @@ --module(nlTcpListener). +-module(ntTcpListener). -include("eNet.hrl"). %% 该文件不可热更新 @@ -93,9 +93,9 @@ loop(Parent, State) -> init({ListenOn, ConMod, ListenOpt}) -> process_flag(trap_exit, true), - Port = nlNetCom:getPort(ListenOn), + Port = ntNetCom:getPort(ListenOn), SockOpts = ?getListValue(tcpOpts, ListenOpt, []), - LastSockOpts = nlNetCom:mergeOpts(?DEFAULT_TCP_OPTIONS, SockOpts), + LastSockOpts = ntNetCom:mergeOpts(?DEFAULT_TCP_OPTIONS, SockOpts), %% Don't active the socket... case gen_tcp:listen(Port, [{active, false} | lists:keydelete(active, 1, LastSockOpts)]) of {ok, LSock} -> @@ -130,7 +130,7 @@ terminate(_Reason, #state{lSock = LSock, listenAddr = Addr, listenPort = Port}) startAcceptor(0, _LSock, _ConMod) -> ok; startAcceptor(N, LSock, ConMod) -> - nlTcpAcceptorSup:startChild([LSock, ConMod, []]), + ntTcpAcceptorSup:startChild([LSock, ConMod, []]), startAcceptor(N - 1, LSock, ConMod). -spec getOpts(pid()) -> [listenOpt()]. diff --git a/src/tcpMod/nlTcpMgrSup.erl b/src/tcp/ntTcpMgrSup.erl similarity index 98% rename from src/tcpMod/nlTcpMgrSup.erl rename to src/tcp/ntTcpMgrSup.erl index 3f07a56..0b97e5a 100644 --- a/src/tcpMod/nlTcpMgrSup.erl +++ b/src/tcp/ntTcpMgrSup.erl @@ -1,4 +1,4 @@ --module(nlTcpMgrSup). +-module(ntTcpMgrSup). -include("eNet.hrl"). -behaviour(supervisor). diff --git a/src/udpMod/nlUdpExm.erl b/src/udp/nlUdpExm.erl similarity index 94% rename from src/udpMod/nlUdpExm.erl rename to src/udp/nlUdpExm.erl index 6ebebf5..d092941 100644 --- a/src/udpMod/nlUdpExm.erl +++ b/src/udp/nlUdpExm.erl @@ -50,7 +50,7 @@ safeRegister(Name) -> end. moduleInit(Parent, Args) -> - case nlTcpAcceptor:init(Args) of + case ntTcpAcceptor:init(Args) of {ok, State} -> proc_lib:init_ack(Parent, {ok, self()}), loop(Parent, State); @@ -66,7 +66,7 @@ loop(Parent, State) -> {'EXIT', Parent, Reason} -> terminate(Reason, State); Msg -> - case nlTcpAcceptor:handleMsg(Msg, State) of + case ntTcpAcceptor:handleMsg(Msg, State) of {ok, NewState} -> loop(Parent, NewState); {stop, Reason} -> @@ -75,7 +75,7 @@ loop(Parent, State) -> end. terminate(Reason, State) -> - nlTcpAcceptor:terminate(Reason, State), + ntTcpAcceptor:terminate(Reason, State), exit(Reason). %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% genExm end %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/src/udpMod/nlUdpIns.erl b/src/udp/nlUdpIns.erl similarity index 100% rename from src/udpMod/nlUdpIns.erl rename to src/udp/nlUdpIns.erl