ft: 文件名与目录修改

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

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).

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"}}}
 ]}.
 

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, []}
  ]}.

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.

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, []}}.

src/comMod/nlAccess.erl → 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()}).

src/comMod/nlCidr.erl → src/misc/ntCidr.erl

@@ -1,4 +1,4 @@
--module(nlCidr).
+-module(ntCidr).
 
 -export([
    parse/1

src/comMod/nlNetCom.erl → src/misc/ntNetCom.erl

@@ -1,4 +1,4 @@
--module(nlNetCom).
+-module(ntNetCom).
 
 -compile([export_all]).
 

src/comMod/nlTokenBucket.erl → src/misc/ntTokenBucket.erl

@@ -13,7 +13,7 @@
 %%       这两种算法的主要区别在于“漏桶算法”能够强行限制数据的传输速率，
 %%       而“令牌桶算法”在能够限制数据的平均传输数据外，还允许某种程度的突发传输。
 %%       在“令牌桶算法”中，只要令牌桶中存在令牌，那么就允许突发地传输数据直到达到用户配置的门限，因此它适合于具有突发特性的流量。
--module(nlTokenBucket).
+-module(ntTokenBucket).
 -include("eNet.hrl").
 
 -export([

src/tcpMod/nlTcpAcceptor.erl → src/tcp/ntTcpAcceptor.erl

@@ -1,4 +1,4 @@
--module(nlTcpAcceptor).
+-module(ntTcpAcceptor).
 -include("eNet.hrl").
 -compile(inline).
 -compile({inline_size, 128}).

src/tcpMod/nlTcpAcceptorSup.erl → src/tcp/ntTcpAcceptorSup.erl

@@ -1,4 +1,4 @@
--module(nlTcpAcceptorSup).
+-module(ntTcpAcceptorSup).
 
 -behaviour(supervisor).
 

src/tcpMod/nlTcpListener.erl → 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()].

src/tcpMod/nlTcpMgrSup.erl → src/tcp/ntTcpMgrSup.erl

@@ -1,4 +1,4 @@
--module(nlTcpMgrSup).
+-module(ntTcpMgrSup).
 -include("eNet.hrl").
 
 -behaviour(supervisor).

src/udpMod/nlUdpExm.erl → 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 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%