fix network code

apps/sdlan/include/sdlan_pb.hrl

@@ -28,7 +28,7 @@
 -ifndef('SDL_DEV_ADDR_PB_H').
 -define('SDL_DEV_ADDR_PB_H', true).
 -record(sdl_dev_addr,
-        {network_id = 0         :: non_neg_integer() | undefined, % = 1, optional, 32 bits
+        {network_id = <<>>      :: unicode:chardata() | undefined, % = 1, optional
          mac = <<>>             :: iodata() | undefined, % = 2, optional
          net_addr = 0           :: non_neg_integer() | undefined, % = 3, optional, 32 bits
          net_bit_len = 0        :: non_neg_integer() | undefined % = 4, optional, 32 bits
@@ -50,7 +50,8 @@
          client_id = <<>>       :: unicode:chardata() | undefined, % = 3, optional
          dev_addr = undefined   :: sdlan_pb:sdl_dev_addr() | undefined, % = 4, optional
          pub_key = <<>>         :: unicode:chardata() | undefined, % = 5, optional
-         token = <<>>           :: unicode:chardata() | undefined % = 6, optional
+         token = <<>>           :: unicode:chardata() | undefined, % = 6, optional
+         network_id = <<>>      :: unicode:chardata() | undefined % = 7, optional
         }).
 -endif.
 
@@ -145,7 +146,7 @@
 -record(sdl_stun_request,
         {cookie = 0             :: non_neg_integer() | undefined, % = 1, optional, 32 bits
          client_id = <<>>       :: unicode:chardata() | undefined, % = 2, optional
-         network_id = 0         :: non_neg_integer() | undefined, % = 3, optional, 32 bits
+         network_id = <<>>      :: unicode:chardata() | undefined, % = 3, optional
          mac = <<>>             :: iodata() | undefined, % = 4, optional
          ip = 0                 :: non_neg_integer() | undefined, % = 5, optional, 32 bits
          nat_type = 0           :: non_neg_integer() | undefined, % = 6, optional, 32 bits
@@ -163,7 +164,7 @@
 -ifndef('SDL_DATA_PB_H').
 -define('SDL_DATA_PB_H', true).
 -record(sdl_data,
-        {network_id = 0         :: non_neg_integer() | undefined, % = 1, optional, 32 bits
+        {network_id = <<>>      :: unicode:chardata() | undefined, % = 1, optional
          src_mac = <<>>         :: iodata() | undefined, % = 2, optional
          dst_mac = <<>>         :: iodata() | undefined, % = 3, optional
          is_p2p = false         :: boolean() | 0 | 1 | undefined, % = 4, optional
@@ -175,7 +176,7 @@
 -ifndef('SDL_REGISTER_PB_H').
 -define('SDL_REGISTER_PB_H', true).
 -record(sdl_register,
-        {network_id = 0         :: non_neg_integer() | undefined, % = 1, optional, 32 bits
+        {network_id = <<>>      :: unicode:chardata() | undefined, % = 1, optional
          src_mac = <<>>         :: iodata() | undefined, % = 2, optional
          dst_mac = <<>>         :: iodata() | undefined % = 3, optional
         }).
@@ -184,7 +185,7 @@
 -ifndef('SDL_REGISTER_ACK_PB_H').
 -define('SDL_REGISTER_ACK_PB_H', true).
 -record(sdl_register_ack,
-        {network_id = 0         :: non_neg_integer() | undefined, % = 1, optional, 32 bits
+        {network_id = <<>>      :: unicode:chardata() | undefined, % = 1, optional
          src_mac = <<>>         :: iodata() | undefined, % = 2, optional
          dst_mac = <<>>         :: iodata() | undefined % = 3, optional
         }).

apps/sdlan/src/http_handler/test_handler.erl

@@ -20,7 +20,7 @@
 handle_request("POST", "/test/auth_token", _, PostParams) ->
     lager:debug("[test_handler] get post params: ~p", [PostParams]),
     Data = #{
-        <<"network_id">> => 8,
+        <<"network_id">> => <<"x7qpl9rtf3sd5gh8jk2mn6bv">>,
         <<"upgrade_type">> => 0,
         <<"upgrade_prompt">> => <<"simple upgrade">>,
         <<"upgrade_address">> => <<"upgrade_address">>
@@ -36,28 +36,47 @@ handle_request("POST", "/test/upgrade", _, PostParams) ->
     },
     {ok, 200, sdlan_util:json_data(Data)};
 
-handle_request("GET", "/test/get_all_networks", _, _) ->
+handle_request("POST", "/test/get_user_network", _, PostParams) ->
-    {ok, 200, sdlan_util:json_data([8, 9, 10])};
+    lager:debug("[test_handler] get post params: ~p", [PostParams]),
+    Data = #{
+        <<"network">> => [
+            #{
+                <<"name">> => <<"test1">>,
+                <<"code">> => <<"x7qpl9rtf3sd5gh8jk2mn6bv">>
+            },
+            #{
+                <<"name">> => <<"test2">>,
+                <<"code">> => <<"p8km3wz7es2df9gh4jk1lo5">>
+            },
+            #{
+                <<"name">> => <<"test3">>,
+                <<"code">> => <<"9fg2hj5kl8pr3ty6vb1nm7x">>
+            }
+        ]
+    },
+    {ok, 200, sdlan_util:json_data(Data)};
 
-handle_request("GET", "/test/get_network", #{<<"id">> := Id0}, _) ->
+handle_request("GET", "/test/get_all_networks", _, _) ->
-    Id = binary_to_integer(Id0),
+    {ok, 200, sdlan_util:json_data([<<"x7qpl9rtf3sd5gh8jk2mn6bv">>, <<"p8km3wz7es2df9gh4jk1lo5">>, <<"9fg2hj5kl8pr3ty6vb1nm7x">>])};
+
+handle_request("GET", "/test/get_network", #{<<"id">> := Id}, _) ->
     Networks = #{
-        8 => #{
+        <<"x7qpl9rtf3sd5gh8jk2mn6bv">> => #{
-            <<"id">> => 8,
+            <<"id">> => <<"x7qpl9rtf3sd5gh8jk2mn6bv">>,
             <<"name">> => <<"test1">>,
             <<"ipaddr">> => <<"10.211.179.0/24">>,
             <<"owner_id">> => 1234,
             <<"disabled_clients">> => []
         },
-        9 => #{
+        <<"p8km3wz7es2df9gh4jk1lo5">> => #{
-            <<"id">> => 9,
+            <<"id">> => <<"p8km3wz7es2df9gh4jk1lo5">>,
             <<"name">> => <<"test2">>,
             <<"ipaddr">> => <<"10.211.180.0/24">>,
             <<"owner_id">> => 1234,
             <<"disabled_clients">> => []
         },
-        10 => #{
+        <<"9fg2hj5kl8pr3ty6vb1nm7x">> => #{
-            <<"id">> => 10,
+            <<"id">> => <<"9fg2hj5kl8pr3ty6vb1nm7x">>,
             <<"name">> => <<"test3">>,
             <<"ipaddr">> => <<"10.211.181.0/24">>,
             <<"owner_id">> => 1234,

apps/sdlan/src/mnesia/client_model.erl

@@ -24,12 +24,12 @@ create_table(Tab) when is_atom(Tab) ->
         {type, set}
     ]).
 
--spec get_table_name(NetworkId :: integer()) -> TableName :: atom().
+-spec get_table_name(NetworkId :: binary()) -> TableName :: atom().
-get_table_name(NetworkId) when is_integer(NetworkId) ->
+get_table_name(NetworkId) when is_binary(NetworkId) ->
-    list_to_atom("client_" ++ integer_to_list(NetworkId)).
+    list_to_atom("client_" ++ binary_to_list(NetworkId)).
 
--spec get_clients(NetworkId :: integer()) -> [Client :: #client{}].
+-spec get_clients(NetworkId :: binary()) -> [Client :: #client{}].
-get_clients(NetworkId) when is_integer(NetworkId) ->
+get_clients(NetworkId) when is_binary(NetworkId) ->
     Tab = get_table_name(NetworkId),
     case mnesia:transaction(fun() -> mnesia:foldl(fun(R, Acc0) -> [R|Acc0] end, [], Tab) end) of
         {'atomic', Items} ->
@@ -38,8 +38,8 @@ get_clients(NetworkId) when is_integer(NetworkId) ->
             []
     end.
 
--spec delete_clients(NetworkId :: integer()) -> ok | {error, Reason :: any()}.
+-spec delete_clients(NetworkId :: binary()) -> ok | {error, Reason :: any()}.
-delete_clients(NetworkId) when is_integer(NetworkId) ->
+delete_clients(NetworkId) when is_binary(NetworkId) ->
     Tab = get_table_name(NetworkId),
     case mnesia:transaction(fun() -> mnesia:clear_table(Tab) end) of
         {'atomic', ok} ->
@@ -48,8 +48,8 @@ delete_clients(NetworkId) when is_integer(NetworkId) ->
             {error, Reason}
     end.
 
--spec delete_client(NetworkId :: integer(), ClientId :: binary()) -> ok | {error, Reason :: any()}.
+-spec delete_client(NetworkId :: binary(), ClientId :: binary()) -> ok | {error, Reason :: any()}.
-delete_client(NetworkId, ClientId) when is_integer(NetworkId), is_binary(ClientId) ->
+delete_client(NetworkId, ClientId) when is_binary(NetworkId), is_binary(ClientId) ->
     Tab = get_table_name(NetworkId),
     case mnesia:transaction(fun() -> mnesia:delete(Tab, ClientId, write) end) of
         {'atomic', ok} ->
@@ -58,8 +58,8 @@ delete_client(NetworkId, ClientId) when is_integer(NetworkId), is_binary(ClientI
             {error, Reason}
     end.
 
--spec disable_client(NetworkId :: integer(), ClientId :: binary()) -> ok | {error, Reason :: any()}.
+-spec disable_client(NetworkId :: binary(), ClientId :: binary()) -> ok | {error, Reason :: any()}.
-disable_client(NetworkId, ClientId) when is_integer(NetworkId), is_binary(ClientId) ->
+disable_client(NetworkId, ClientId) when is_binary(NetworkId), is_binary(ClientId) ->
     Tab = get_table_name(NetworkId),
     Fun = fun() ->
         case mnesia:read(Tab, ClientId, read) of
@@ -78,9 +78,9 @@ disable_client(NetworkId, ClientId) when is_integer(NetworkId), is_binary(Client
     end.
 
 %% 分配ip地址的时候，以mac地址为唯一基准
--spec alloc_ip(NetworkId :: integer(), Ips :: list(), ClientId :: binary(), Mac :: binary(), NetAddr0 :: integer()) ->
+-spec alloc_ip(NetworkId :: binary(), Ips :: list(), ClientId :: binary(), Mac :: binary(), NetAddr0 :: integer()) ->
     {ok, Ip :: integer()} | {error, Reason :: any()}.
-alloc_ip(NetworkId, Ips, ClientId, Mac, NetAddr0) when is_binary(ClientId), is_integer(NetAddr0), is_binary(Mac) ->
+alloc_ip(NetworkId, Ips, ClientId, Mac, NetAddr0) when is_binary(NetworkId), is_binary(ClientId), is_integer(NetAddr0), is_binary(Mac) ->
     case mnesia:transaction(fun() -> alloc_ip0(NetworkId, Ips, ClientId, Mac, NetAddr0) end) of
         {'atomic', Res} ->
             {ok, Res};
@@ -120,7 +120,7 @@ alloc_ip0(NetworkId, Ips, ClientId, Mac, NetAddr0) ->
 %%% helper functions
 %%%===================================================================
 
-debug(NetworkId) when is_integer(NetworkId) ->
+debug(NetworkId) when is_binary(NetworkId) ->
     Tab = get_table_name(NetworkId),
     F = fun() ->
         Q = qlc:q([E || E <- mnesia:table(Tab)]),

apps/sdlan/src/model/network_bo.erl

@@ -1,29 +0,0 @@
-%%%-------------------------------------------------------------------
-%%% @author aresei
-%%% @copyright (C) 2023, <COMPANY>
-%%% @doc
-%%%
-%%% @end
-%%% Created : 16. 5月 2023 12:48
-%%%-------------------------------------------------------------------
--module(network_bo).
--author("aresei").
--include("sdlan.hrl").
-
--define(POOL_NAME, mysql_sdlan).
-
-%% API
--export([get_all_networks/0, get_network_by_id/1]).
-
--spec get_all_networks() -> Networks :: [integer()].
-get_all_networks() ->
-    case mysql_pool:get_all(?POOL_NAME, <<"SELECT id FROM network">>) of
-        {ok, Networks} ->
-            lists:map(fun(#{<<"id">> := Id}) -> Id end, Networks);
-        {error, _} ->
-            []
-    end.
-
--spec get_network_by_id(Id :: integer()) -> undefined | {ok, NetworkInfo :: map()}.
-get_network_by_id(Id) when is_integer(Id) ->
-    mysql_pool:get_row(?POOL_NAME, <<"SELECT * FROM network WHERE id = ? LIMIT 1">>, [Id]).

apps/sdlan/src/mysql/mysql_pool.erl

@@ -1,48 +0,0 @@
-%%%-------------------------------------------------------------------
-%%% @author aresei
-%%% @copyright (C) 2018, <COMPANY>
-%%% @doc
-%%%
-%%% @end
-%%% Created : 29. 九月 2018 17:01
-%%%-------------------------------------------------------------------
--module(mysql_pool).
--author("aresei").
-
-%% API
--export([get_row/2, get_row/3, get_all/2, get_all/3]).
--export([update/4, update_by/2, update_by/3, insert/4]).
-
-%% 从数据库中查找一行记录
--spec get_row(Pool :: atom(), Sql::binary()) -> {ok, Record::map()} | undefined.
-get_row(Pool, Sql) when is_atom(Pool), is_binary(Sql) ->
-    poolboy:transaction(Pool, fun(ConnPid) -> mysql_provider:get_row(ConnPid, Sql) end).
-
--spec get_row(Pool :: atom(), Sql::binary(), Params::list()) -> {ok, Record::map()} | undefined.
-get_row(Pool, Sql, Params) when is_atom(Pool), is_binary(Sql), is_list(Params) ->
-    poolboy:transaction(Pool, fun(ConnPid) -> mysql_provider:get_row(ConnPid, Sql, Params) end).
-
--spec get_all(Pool :: atom(), Sql::binary()) -> {ok, Rows::list()} | {error, Reason :: any()}.
-get_all(Pool, Sql) when is_atom(Pool), is_binary(Sql) ->
-    poolboy:transaction(Pool, fun(ConnPid) -> mysql_provider:get_all(ConnPid, Sql) end).
-
--spec get_all(Pool :: atom(), Sql::binary(), Params::list()) -> {ok, Rows::list()} | {error, Reason::any()}.
-get_all(Pool, Sql, Params) when is_atom(Pool), is_binary(Sql), is_list(Params) ->
-    poolboy:transaction(Pool, fun(ConnPid) -> mysql_provider:get_all(ConnPid, Sql, Params) end).
-
--spec insert(Pool :: atom(), Table :: binary(), Fields :: map() | list(), boolean()) ->
-    ok | {ok, InsertId :: integer()} | {error, Reason :: any()}.
-insert(Pool, Table, Fields, FetchInsertId) when is_atom(Pool), is_binary(Table), is_list(Fields); is_map(Fields), is_boolean(FetchInsertId) ->
-    poolboy:transaction(Pool, fun(ConnPid) -> mysql_provider:insert(ConnPid, Table, Fields, FetchInsertId) end).
-
--spec update_by(Pool :: atom(), UpdateSql :: binary()) -> {ok, AffectedRows :: integer()} | {error, Reason :: any()}.
-update_by(Pool, UpdateSql) when is_atom(Pool), is_binary(UpdateSql) ->
-    poolboy:transaction(Pool, fun(ConnPid) -> mysql_provider:update_by(ConnPid, UpdateSql) end).
-
--spec update_by(Pool :: atom(), UpdateSql :: binary(), Params :: list()) -> {ok, AffectedRows :: integer()} | {error, Reason :: any()}.
-update_by(Pool, UpdateSql, Params) when is_atom(Pool), is_binary(UpdateSql) ->
-    poolboy:transaction(Pool, fun(ConnPid) -> mysql_provider:update_by(ConnPid, UpdateSql, Params) end).
-
--spec update(Pool :: atom(), Table :: binary(), Fields :: map(), WhereFields :: map()) -> {ok, AffectedRows::integer()} | {error, Reason::any()}.
-update(Pool, Table, Fields, WhereFields) when is_atom(Pool), is_binary(Table), is_map(Fields), is_map(WhereFields) ->
-    poolboy:transaction(Pool, fun(ConnPid) -> mysql_provider:update(ConnPid, Table, Fields, WhereFields) end).

apps/sdlan/src/mysql/mysql_provider.erl

@@ -1,144 +0,0 @@
-%%%-------------------------------------------------------------------
-%%% @author aresei
-%%% @copyright (C) 2018, <COMPANY>
-%%% @doc
-%%%
-%%% @end
-%%% Created : 29. 九月 2018 17:01
-%%%-------------------------------------------------------------------
--module(mysql_provider).
--author("aresei").
-
-%% API
--export([get_row/2, get_row/3, get_all/2, get_all/3]).
--export([update/4, update_by/2, update_by/3, insert/4]).
-
-%% 从数据库中查找一行记录
--spec get_row(ConnPid :: pid(), Sql::binary()) -> {ok, Record::map()} | undefined.
-get_row(ConnPid, Sql) when is_pid(ConnPid), is_binary(Sql) ->
-    lager:debug("[mysql_client] get_row sql is: ~p", [Sql]),
-    case mysql:query(ConnPid, Sql) of
-        {ok, Names, [Row | _]} ->
-            {ok, maps:from_list(lists:zip(Names, Row))};
-        {ok, _, []} ->
-            undefined;
-        Error ->
-            lager:warning("[mysql_client] get error: ~p", [Error]),
-            undefined
-    end.
-
--spec get_row(ConnPid :: pid(), Sql::binary(), Params::list()) -> {ok, Record::map()} | undefined.
-get_row(ConnPid, Sql, Params) when is_pid(ConnPid), is_binary(Sql), is_list(Params) ->
-    lager:debug("[mysql_client] get_row sql is: ~p, params: ~p", [Sql, Params]),
-    case mysql:query(ConnPid, Sql, Params) of
-        {ok, Names, [Row | _]} ->
-            {ok, maps:from_list(lists:zip(Names, Row))};
-        {ok, _, []} ->
-            undefined;
-        Error ->
-            lager:warning("[mysql_client] get error: ~p", [Error]),
-            undefined
-    end.
-
--spec get_all(ConnPid :: pid(), Sql::binary()) -> {ok, Rows::list()} | {error, Reason :: any()}.
-get_all(ConnPid, Sql) when is_pid(ConnPid), is_binary(Sql) ->
-    lager:debug("[mysql_client] get_all sql is: ~p", [Sql]),
-    case mysql:query(ConnPid, Sql) of
-        {ok, Names, Rows} ->
-            {ok, lists:map(fun(Row) -> maps:from_list(lists:zip(Names, Row)) end, Rows)};
-        {error, Reason} ->
-            lager:warning("[mysql_client] get error: ~p", [Reason]),
-            {error, Reason}
-    end.
-
--spec get_all(ConnPid :: pid(), Sql::binary(), Params::list()) -> {ok, Rows::list()} | {error, Reason::any()}.
-get_all(ConnPid, Sql, Params) when is_pid(ConnPid), is_binary(Sql), is_list(Params) ->
-    lager:debug("[mysql_client] get_all sql is: ~p, params: ~p", [Sql, Params]),
-    case mysql:query(ConnPid, Sql, Params) of
-        {ok, Names, Rows} ->
-            {ok, lists:map(fun(Row) -> maps:from_list(lists:zip(Names, Row)) end, Rows)};
-        {error, Reason} ->
-            lager:warning("[mysql_client] get error: ~p", [Reason]),
-            {error, Reason}
-    end.
-
--spec insert(ConnPid :: pid(), Table :: binary(), Fields :: map() | list(), boolean()) ->
-    ok | {ok, InsertId :: integer()} | {error, Reason :: any()}.
-insert(ConnPid, Table, Fields, FetchInsertId) when is_pid(ConnPid), is_binary(Table), is_map(Fields), is_boolean(FetchInsertId) ->
-    insert(ConnPid, Table, maps:to_list(Fields), FetchInsertId);
-insert(ConnPid, Table, Fields, FetchInsertId) when is_pid(ConnPid), is_binary(Table), is_list(Fields), is_boolean(FetchInsertId) ->
-    {Keys, Values} = kvs(Fields),
-
-    FieldSql = iolist_to_binary(lists:join(<<", ">>, Keys)),
-    Placeholders = lists:duplicate(length(Keys), <<"?">>),
-    ValuesPlaceholder = iolist_to_binary(lists:join(<<", ">>, Placeholders)),
-
-    Sql = <<"INSERT INTO ", Table/binary, "(", FieldSql/binary, ") VALUES(", ValuesPlaceholder/binary, ")">>,
-    lager:debug("[mysql_client] insert sql is: ~p, params: ~p", [Sql, Values]),
-    case mysql:query(ConnPid, Sql, Values) of
-        ok ->
-            case FetchInsertId of
-                true ->
-                    InsertId = mysql:insert_id(ConnPid),
-                    {ok, InsertId};
-                false ->
-                    ok
-            end;
-        Error ->
-            Error
-    end.
-
--spec update_by(ConnPid :: pid(), UpdateSql :: binary()) -> {ok, AffectedRows :: integer()} | {error, Reason :: any()}.
-update_by(ConnPid, UpdateSql) when is_pid(ConnPid), is_binary(UpdateSql) ->
-    lager:debug("[mysql_client] updateBySql sql: ~p", [UpdateSql]),
-    case mysql:query(ConnPid, UpdateSql) of
-        ok ->
-            AffectedRows = mysql:affected_rows(ConnPid),
-            {ok, AffectedRows};
-        Error ->
-            Error
-    end.
-
--spec update_by(ConnPid :: pid(), UpdateSql :: binary(), Params :: list()) -> {ok, AffectedRows :: integer()} | {error, Reason :: any()}.
-update_by(ConnPid, UpdateSql, Params) when is_pid(ConnPid), is_binary(UpdateSql) ->
-    lager:debug("[mysql_client] updateBySql sql: ~p, params: ~p", [UpdateSql, Params]),
-    case mysql:query(ConnPid, UpdateSql, Params) of
-        ok ->
-            AffectedRows = mysql:affected_rows(ConnPid),
-            {ok, AffectedRows};
-        Error ->
-            Error
-    end.
-
--spec update(ConnPid :: pid(), Sql :: binary(), Fields :: map(), WhereFields :: map()) ->
-    {ok, AffectedRows::integer()} | {error, Reason::any()}.
-update(ConnPid, Table, Fields, WhereFields) when is_pid(ConnPid), is_binary(Table), is_map(Fields), is_map(WhereFields) ->
-    %% 拼接set
-    {SetKeys, SetVals} = kvs(Fields),
-    SetKeys1 = lists:map(fun(K) when is_binary(K) -> <<"`", K/binary, "` = ?">> end, SetKeys),
-    SetSql = iolist_to_binary(lists:join(<<", ">>, SetKeys1)),
-
-    %% 拼接where
-    {WhereKeys, WhereVals} = kvs(WhereFields),
-    WhereKeys1 = lists:map(fun(K) when is_binary(K) -> <<"`", K/binary, "` = ?">> end, WhereKeys),
-    WhereSql = iolist_to_binary(lists:join(<<" AND ">>, WhereKeys1)),
-
-    Params = SetVals ++ WhereVals,
-
-    Sql = <<"UPDATE ", Table/binary, " SET ",  SetSql/binary, " WHERE ", WhereSql/binary>>,
-    lager:debug("[mysql_client] update sql is: ~p, params: ~p", [Sql, Params]),
-    case mysql:query(ConnPid, Sql, Params) of
-        ok ->
-            AffectedRows = mysql:affected_rows(ConnPid),
-            {ok, AffectedRows};
-        Error ->
-            lager:error("[mysql_client] update sql: ~p, params: ~p, get a error: ~p", [Sql, Params, Error]),
-            Error
-    end.
-
--spec kvs(Fields :: map() | list()) -> {Keys :: list(), Values :: list()}.
-kvs(Fields) when is_map(Fields) ->
-    kvs(maps:to_list(Fields));
-kvs(Fields) when is_list(Fields) ->
-    {Keys0, Values0} = lists:foldl(fun({K, V}, {Acc0, Acc1}) -> {[K|Acc0], [V|Acc1]} end, {[], []}, Fields),
-    {lists:reverse(Keys0), lists:reverse(Values0)}.

apps/sdlan/src/sdlan.app.src

@@ -11,7 +11,6 @@
     ranch,
     poolboy,
     mysql,
-    esockd,
     jiffy,
     hackney,
     gpb,

apps/sdlan/src/sdlan_api.erl

@@ -13,9 +13,9 @@
 
 %% API
 -export([get_all_networks/0, get_network/1]).
--export([auth_token/3, node_online/3, node_offline/2, flow_report/5, network_forward_report/2]).
+-export([auth_token/3, check_network_code/3, node_online/3, node_offline/2, flow_report/5, network_forward_report/2]).
 
--spec get_all_networks() -> {ok, [NetworkId :: integer()]} | {error, Reason :: any()}.
+-spec get_all_networks() -> {ok, [NetworkId :: binary()]} | {error, Reason :: any()}.
 get_all_networks() ->
     case catch do_get("get_all_networks", []) of
         {ok, Resp} ->
@@ -31,9 +31,9 @@ get_all_networks() ->
             Error
     end.
 
--spec get_network(Id :: integer()) -> {ok, Network :: map()} | {error, Reason :: any()}.
+-spec get_network(Id :: binary()) -> {ok, Network :: map()} | {error, Reason :: any()}.
-get_network(Id) when is_integer(Id) ->
+get_network(Id) when is_binary(Id) ->
-    case catch do_get("get_network", [{<<"id">>, integer_to_binary(Id)}]) of
+    case catch do_get("get_network", [{<<"id">>, Id}]) of
         {ok, Resp} ->
             case catch jiffy:decode(Resp, [return_maps]) of
                 #{<<"result">> := Network} ->
@@ -61,8 +61,22 @@ auth_token(ClientId, Token, Version) when is_binary(ClientId), is_binary(Token),
             Error
     end.
 
--spec node_online(ClientId :: binary(), NetworkId :: integer(), IpAddr :: binary()) -> {ok, Resp :: map()} | {error, Reason :: any()}.
+-spec check_network_code(ClientId :: binary(), NetworkCode :: binary(), Version :: integer()) -> {ok, Resp :: map()} | {error, Reason :: any()}.
-node_online(ClientId, NetworkId, IpAddr) when is_binary(ClientId), is_integer(NetworkId), is_binary(IpAddr) ->
+check_network_code(ClientId, NetworkCode, Version) when is_binary(ClientId), is_binary(NetworkCode), is_integer(Version) ->
+    case catch do_post("checkNetwork", #{<<"client_id">> => ClientId, <<"code">> => NetworkCode, <<"version">> => Version}) of
+        {ok, Resp} ->
+            case catch jiffy:decode(Resp, [return_maps]) of
+                Result when is_map(Result) ->
+                    {ok, Result};
+                {error, Reason} ->
+                    {error, Reason}
+            end;
+        Error ->
+            Error
+    end.
+
+-spec node_online(ClientId :: binary(), NetworkId :: binary(), IpAddr :: binary()) -> {ok, Resp :: map()} | {error, Reason :: any()}.
+node_online(ClientId, NetworkId, IpAddr) when is_binary(ClientId), is_binary(NetworkId), is_binary(IpAddr) ->
     case catch do_post("set_node_status", #{<<"client_id">> => ClientId, <<"network_id">> => NetworkId, <<"ip_addr">> => IpAddr, <<"status">> => 1}) of
         {ok, Resp} ->
             {ok, catch jiffy:decode(Resp, [return_maps])};
@@ -70,8 +84,8 @@ node_online(ClientId, NetworkId, IpAddr) when is_binary(ClientId), is_integer(Ne
             Error
     end.
 
--spec node_offline(ClientId :: binary(), NetworkId :: integer()) -> {ok, Resp :: map()} | {error, Reason :: any()}.
+-spec node_offline(ClientId :: binary(), NetworkId :: binary()) -> {ok, Resp :: map()} | {error, Reason :: any()}.
-node_offline(ClientId, NetworkId) when is_binary(ClientId), is_integer(NetworkId) ->
+node_offline(ClientId, NetworkId) when is_binary(ClientId), is_binary(NetworkId) ->
     case catch do_post("set_node_status", #{<<"client_id">> => ClientId, <<"network_id">> => NetworkId, <<"status">> => 0}) of
         {ok, Resp} ->
             {ok, catch jiffy:decode(Resp, [return_maps])};
@@ -79,10 +93,10 @@ node_offline(ClientId, NetworkId) when is_binary(ClientId), is_integer(NetworkId
             Error
     end.
 
--spec flow_report(ClientId :: binary(), NetworkId :: integer(), ForwardNum :: integer(), P2PNum :: integer(), InboundNum :: integer()) ->
+-spec flow_report(ClientId :: binary(), NetworkId :: binary(), ForwardNum :: integer(), P2PNum :: integer(), InboundNum :: integer()) ->
     {ok, Resp :: map()} | {error, Reason :: any()}.
 flow_report(ClientId, NetworkId, ForwardNum, P2PNum, InboundNum)
-    when is_binary(ClientId), is_integer(NetworkId), is_integer(ForwardNum), is_integer(P2PNum), is_integer(InboundNum) ->
+    when is_binary(ClientId), is_binary(NetworkId), is_integer(ForwardNum), is_integer(P2PNum), is_integer(InboundNum) ->
     Params = #{
         <<"client_id">> => ClientId,
         <<"network_id">> => NetworkId,
@@ -97,9 +111,9 @@ flow_report(ClientId, NetworkId, ForwardNum, P2PNum, InboundNum)
             Error
     end.
 
--spec network_forward_report(NetworkId :: integer(), ForwardNum :: integer()) ->
+-spec network_forward_report(NetworkId :: binary(), ForwardNum :: integer()) ->
     {ok, Resp :: map()} | {error, Reason :: any()}.
-network_forward_report(NetworkId, ForwardNum) when is_integer(NetworkId), is_integer(ForwardNum) ->
+network_forward_report(NetworkId, ForwardNum) when is_binary(NetworkId), is_integer(ForwardNum) ->
     Params = #{
         <<"network_id">> => NetworkId,
         <<"forward_num">> => ForwardNum

apps/sdlan/src/sdlan_app.erl

@@ -61,18 +61,15 @@ start_tcp_server() ->
     Backlog = proplists:get_value(backlog, Props, 1024),
     Port = proplists:get_value(port, Props),
 
-    TransOpts = [
+    TransOpts = #{
-        {tcp_options, [
+        num_acceptors => Acceptors,
-            binary,
+        max_connections => MaxConnections,
-            {reuseaddr, true},
+        socket_opts => [
-            {active, false},
+            {port, Port},
-            {packet, 2},
             {nodelay, false},
             {backlog, Backlog}
-        ]},
+        ]
-        {acceptors, Acceptors},
+    },
-        {max_connections, MaxConnections}
+    {ok, _} = ranch:start_listener('sdlan/tcp_server', ranch_tcp, TransOpts, sdlan_channel, []),
-    ],
-    {ok, _} = esockd:open('sdlan/tcp_server', Port, TransOpts, {sdlan_channel, start_link, []}),
 
     lager:debug("[sdlan_app] the tcp server start at: ~p", [Port]).

apps/sdlan/src/sdlan_channel.erl

@@ -35,7 +35,7 @@
 -define(UPGRADE_FORCE, 2).
 
 %% API
--export([start_link/2]).
+-export([start_link/4]).
 -export([publish_command/4, send_event/3, stop/2, move_network/3]).
 
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]).
@@ -97,19 +97,15 @@ stop(Pid, Reason) when is_pid(Pid) ->
 %% esockd callback
 %%--------------------------------------------------------------------
 
-start_link(Transport, Sock) ->
+start_link(Ref, _Socket, Transport, Opts) ->
-    {ok, proc_lib:spawn_link(?MODULE, init, [[Transport, Sock]])}.
+    {ok, proc_lib:spawn_link(?MODULE, init, [[Ref, Transport, Opts]])}.
 
-init([Transport, Sock]) ->
+init([Ref, Transport, _Opts = []]) ->
-    lager:debug("[sdlan_channel] get a new connection: ~p", [Sock]),
+    {ok, Socket} = ranch:handshake(Ref),
-    case Transport:wait(Sock) of
+    lager:debug("[sdlan_channel] get a new connection: ~p", [Socket]),
-        {ok, NewSock} ->
+    Transport:setopts(Socket, [{active, true}, {packet, 2}]),
-            Transport:setopts(Sock, [{active, true}]),
     erlang:start_timer(?PING_TICKER, self(), ping_ticker),
-            gen_server:enter_loop(?MODULE, [], #state{transport = Transport, socket = NewSock});
+    gen_server:enter_loop(?MODULE, [], #state{transport = Transport, socket = Socket}).
-        {error, Reason} ->
-            {stop, Reason}
-    end.
 
 handle_call(_Request, _From, State) ->
     {reply, ok, State}.
@@ -117,8 +113,9 @@ handle_call(_Request, _From, State) ->
 handle_cast(_Msg, State) ->
     {noreply, State}.
 
+%% 带上token或者网络id来注册
 handle_info({tcp, Sock, <<PacketId:32, ?PACKET_REGISTER_SUPER, Body/binary>>}, State=#state{transport = Transport, socket = Sock}) ->
-    #sdl_register_super{version = Version, client_id = ClientId, dev_addr = #sdl_dev_addr{net_addr = NetAddr0, mac = Mac}, token = Token, pub_key = PubKey} = sdlan_pb:decode_msg(Body, sdl_register_super),
+    #sdl_register_super{version = Version, client_id = ClientId, dev_addr = #sdl_dev_addr{net_addr = NetAddr0, mac = Mac}, network_id = NetworkCode, token = Token, pub_key = PubKey} = sdlan_pb:decode_msg(Body, sdl_register_super),
 
     %% 参数检查
     lager:debug("[sdlan_channel] client_id: ~p, public_key: ~p", [ClientId, PubKey]),
@@ -126,8 +123,15 @@ handle_info({tcp, Sock, <<PacketId:32, ?PACKET_REGISTER_SUPER, Body/binary>>}, S
     %% Mac地址不能是广播地址
     true = not (sdlan_util:is_multicast_mac(Mac) orelse sdlan_util:is_broadcast_mac(Mac)),
 
-    case sdlan_api:auth_token(ClientId, Token, Version) of
+    AuthResult = if
-        {ok, #{<<"result">> := #{<<"network_id">> := NetworkId, <<"upgrade_type">> := UpgradeType, <<"upgrade_prompt">> := UpgradePrompt, <<"upgrade_address">> := UpgradeAddress}}} when is_integer(NetworkId) ->
+                     Token /= <<>> ->
+                         sdlan_api:auth_token(ClientId, Token, Version);
+                     NetworkCode /= <<>> ->
+                         sdlan_api:check_network_code(ClientId, NetworkCode, Version)
+                 end,
+
+    case AuthResult of
+        {ok, #{<<"result">> := #{<<"network_id">> := NetworkId, <<"upgrade_type">> := UpgradeType, <<"upgrade_prompt">> := UpgradePrompt, <<"upgrade_address">> := UpgradeAddress}}} when is_binary(NetworkId) ->
             lager:debug("[sdlan_channel] client_id: ~p, mac: ~p, token: ~p, version: ~p, registerd, alloc network_id: ~p", [ClientId, sdlan_util:format_mac(Mac), Token, Version, NetworkId]),
             %% 建立到network的对应关系
             case sdlan_network:get_pid(NetworkId) of
@@ -137,7 +141,7 @@ handle_info({tcp, Sock, <<PacketId:32, ?PACKET_REGISTER_SUPER, Body/binary>>}, S
                             RsaPubKey = sdlan_cipher:rsa_pem_decode(PubKey),
                             EncodedAesKey = rsa_encode(AesKey, RsaPubKey),
 
-                            RegisterSuperAck = sdlan_pb:encode_msg(#sdl_register_super_ack {
+                            RegisterSuperAck = sdlan_pb:encode_msg(Ack = #sdl_register_super_ack {
                                 dev_addr = #sdl_dev_addr{
                                     network_id = NetworkId,
                                     net_addr = NetAddr,
@@ -149,6 +153,7 @@ handle_info({tcp, Sock, <<PacketId:32, ?PACKET_REGISTER_SUPER, Body/binary>>}, S
                                 upgrade_prompt = UpgradePrompt,
                                 upgrade_address = UpgradeAddress
                             }),
+                            lager:debug("ack is: ~p", [Ack]),
 
                             %% 发送确认信息
                             Reply = <<PacketId:32, ?PACKET_REGISTER_SUPER_ACK, RegisterSuperAck/binary>>,
@@ -226,7 +231,7 @@ handle_info({tcp, Sock, <<PacketId:32, ?PACKET_QUERY_INFO, Body/binary>>}, State
     end;
 
 handle_info({tcp, _Sock, <<0:32, ?PACKET_PING>>}, State = #state{transport = Transport, socket = Sock, client_id = ClientId,  ping_counter = PingCounter}) ->
-    lager:debug("[sdlan_channel] client_id: ~p, get ping", [ClientId]),
+    %lager:debug("[sdlan_channel] client_id: ~p, get ping", [ClientId]),
     Transport:send(Sock, <<0:32, ?PACKET_PONG>>),
     {noreply, State#state{ping_counter = PingCounter + 1}};
 

apps/sdlan/src/sdlan_network.erl

@@ -23,7 +23,7 @@
 -export([start_link/2]).
 -export([get_name/1, get_pid/1, assign_ip_addr/5, peer_info/3, unregister/3, debug_info/1, get_network_id/1, get_used_map/1]).
 -export([forward/5, update_hole/6, disable_client/2, get_channel/2, dropout_client/2, reload/1]).
--export([test_event/1]).
+-export([test_event/1, simple_debug/0]).
 
 %% gen_server callbacks
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]).
@@ -46,7 +46,7 @@
 }).
 
 -record(state, {
-    network_id :: integer(),
+    network_id :: binary(),
     name :: binary(),
     ipaddr :: binary(),
     mask_len :: integer(),
@@ -73,17 +73,21 @@
 %%% API
 %%%===================================================================
 
+simple_debug() ->
+    Pid = get_pid(<<"x7qpl9rtf3sd5gh8jk2mn6bv">>),
+    debug_info(Pid).
+
 %% -- MARK: 测试函数
 test_event(Pid) ->
     gen_server:cast(Pid, test_event).
 
--spec get_pid(Id :: integer()) -> undefined | pid().
+-spec get_pid(Id :: binary()) -> undefined | pid().
-get_pid(Id) when is_integer(Id) ->
+get_pid(Id) when is_binary(Id) ->
     whereis(get_name(Id)).
 
--spec get_name(Id :: integer()) -> atom().
+-spec get_name(Id :: binary()) -> atom().
-get_name(Id) when is_integer(Id) ->
+get_name(Id) when is_binary(Id) ->
-    list_to_atom("sdlan_network:" ++ integer_to_list(Id)).
+    list_to_atom("sdlan_network:" ++ binary_to_list(Id)).
 
 -spec reload(Pid :: pid()) -> ok | {error, Reason :: any()}.
 reload(Pid) when is_pid(Pid) ->
@@ -94,7 +98,7 @@ reload(Pid) when is_pid(Pid) ->
 assign_ip_addr(Pid, ChannelPid, ClientId, Mac, NetAddr) when is_pid(Pid), is_pid(ChannelPid), is_binary(ClientId), is_binary(Mac), is_integer(NetAddr) ->
     gen_server:call(Pid, {assign_ip_addr, ChannelPid, ClientId, Mac, NetAddr}).
 
--spec get_network_id(Pid :: pid()) -> {ok, NetworkId :: integer()}.
+-spec get_network_id(Pid :: pid()) -> {ok, NetworkId :: binary()}.
 get_network_id(Pid) when is_pid(Pid) ->
     gen_server:call(Pid, get_network_id).
 
@@ -140,9 +144,9 @@ get_used_map(undefined) ->
     #{}.
 
 %% @doc Spawns the server and registers the local name (unique)
--spec(start_link(Name :: atom(), Id :: integer()) ->
+-spec(start_link(Name :: atom(), Id :: binary()) ->
     {ok, Pid :: pid()} | ignore | {error, Reason :: term()}).
-start_link(Name, Id) when is_atom(Name), is_integer(Id) ->
+start_link(Name, Id) when is_atom(Name), is_binary(Id) ->
     gen_server:start_link({local, Name}, ?MODULE, [Id], []).
 
 %%%===================================================================
@@ -154,7 +158,7 @@ start_link(Name, Id) when is_atom(Name), is_integer(Id) ->
 -spec(init(Args :: term()) ->
     {ok, State :: #state{}} | {ok, State :: #state{}, timeout() | hibernate} |
     {stop, Reason :: term()} | ignore).
-init([Id]) when is_integer(Id) ->
+init([Id]) ->
     erlang:process_flag(trap_exit, true),
     case sdlan_api:get_network(Id) of
         {ok, #{<<"ipaddr">> := Null}} when Null == <<"null">>; Null == <<"NULL">> ->
@@ -164,7 +168,7 @@ init([Id]) when is_integer(Id) ->
             Ips = sdlan_ipaddr:ips(IpAddr, MaskLen),
             AesKey = sdlan_util:rand_byte(32),
             %% 限流key
-            ThrottleKey = list_to_atom("network_throttle:" ++ integer_to_list(Id)),
+            ThrottleKey = list_to_atom("network_throttle:" ++ binary_to_list(Id)),
             %% 绑定到资源协调器
             sdlan_network_coordinator:attach(self(), ThrottleKey),
 
@@ -500,8 +504,8 @@ code_change(_OldVsn, State = #state{}, _Extra) ->
 %%%===================================================================
 
 %% 创建数据库表
--spec create_mnesia_table(NetworkId :: integer()) -> no_return().
+-spec create_mnesia_table(NetworkId :: binary()) -> no_return().
-create_mnesia_table(NetworkId) when is_integer(NetworkId) ->
+create_mnesia_table(NetworkId) when is_binary(NetworkId) ->
     Tab = client_model:get_table_name(NetworkId),
     Tables = mnesia:system_info(tables),
     case lists:member(Tab, Tables) of

apps/sdlan/src/sdlan_network_sup.erl

@@ -51,8 +51,8 @@ init([]) ->
 %%% Internal functions
 %%%===================================================================
 
--spec ensured_network_started(Id :: integer()) -> {ok, Pid :: pid()} | {error, Reason :: any()}.
+-spec ensured_network_started(Id :: binary()) -> {ok, Pid :: pid()} | {error, Reason :: any()}.
-ensured_network_started(Id) when is_integer(Id) ->
+ensured_network_started(Id) when is_binary(Id) ->
     case sdlan_network:get_pid(Id) of
         undefined ->
             case supervisor:start_child(?MODULE, child_spec(Id)) of
@@ -67,8 +67,8 @@ ensured_network_started(Id) when is_integer(Id) ->
             {ok, Pid}
     end.
 
--spec start_network(Id :: integer()) -> {ok, Pid :: pid()} | {error, Reason :: any()}.
+-spec start_network(Id :: binary()) -> {ok, Pid :: pid()} | {error, Reason :: any()}.
-start_network(Id) when is_integer(Id) ->
+start_network(Id) when is_binary(Id) ->
     case supervisor:start_child(?MODULE, child_spec(Id)) of
         {ok, Pid} when is_pid(Pid) ->
             {ok, Pid};
@@ -88,8 +88,8 @@ reallocate_bind_width() ->
     ChildPids = lists:map(fun({_Id, ChildPid, _Type, _Modules}) -> ChildPid end, supervisor:which_children(?MODULE)),
     set_network_bind(length(ChildPids)).
 
--spec delete_network(NetworkId :: integer()) -> ok | {error, Reason :: any()}.
+-spec delete_network(NetworkId :: binary()) -> ok | {error, Reason :: any()}.
-delete_network(NetworkId) when is_integer(NetworkId) ->
+delete_network(NetworkId) when is_binary(NetworkId) ->
     ChildId = sdlan_network:get_name(NetworkId),
     case supervisor:terminate_child(?MODULE, ChildId) of
         ok ->
@@ -98,8 +98,8 @@ delete_network(NetworkId) when is_integer(NetworkId) ->
             Error
     end.
 
--spec child_spec(Id :: integer()) -> map().
+-spec child_spec(Id :: binary()) -> map().
-child_spec(Id) when is_integer(Id) ->
+child_spec(Id) when is_binary(Id) ->
     Name = sdlan_network:get_name(Id),
     #{
         id => Name,

apps/sdlan/src/sdlan_pb.erl

@@ -218,8 +218,9 @@ encode_msg_sdl_dev_addr(#sdl_dev_addr{network_id = F1, mac = F2, net_addr = F3,
             true ->
                 begin
                     TrF1 = id(F1, TrUserData),
-                    if TrF1 =:= 0 -> Bin;
+                    case is_empty_string(TrF1) of
-                       true -> e_varint(TrF1, <<Bin/binary, 8>>, TrUserData)
+                        true -> Bin;
+                        false -> e_type_string(TrF1, <<Bin/binary, 10>>, TrUserData)
                     end
                 end
          end,
@@ -257,7 +258,7 @@ encode_msg_sdl_empty(_Msg, _TrUserData) -> <<>>.
 encode_msg_sdl_register_super(Msg, TrUserData) -> encode_msg_sdl_register_super(Msg, <<>>, TrUserData).
 
 
-encode_msg_sdl_register_super(#sdl_register_super{version = F1, installed_channel = F2, client_id = F3, dev_addr = F4, pub_key = F5, token = F6}, Bin, TrUserData) ->
+encode_msg_sdl_register_super(#sdl_register_super{version = F1, installed_channel = F2, client_id = F3, dev_addr = F4, pub_key = F5, token = F6, network_id = F7}, Bin, TrUserData) ->
     B1 = if F1 == undefined -> Bin;
             true ->
                 begin
@@ -306,7 +307,7 @@ encode_msg_sdl_register_super(#sdl_register_super{version = F1, installed_channe
                     end
                 end
          end,
-    if F6 == undefined -> B5;
+    B6 = if F6 == undefined -> B5;
             true ->
                 begin
                     TrF6 = id(F6, TrUserData),
@@ -315,6 +316,16 @@ encode_msg_sdl_register_super(#sdl_register_super{version = F1, installed_channe
                         false -> e_type_string(TrF6, <<B5/binary, 50>>, TrUserData)
                     end
                 end
+         end,
+    if F7 == undefined -> B6;
+       true ->
+           begin
+               TrF7 = id(F7, TrUserData),
+               case is_empty_string(TrF7) of
+                   true -> B6;
+                   false -> e_type_string(TrF7, <<B6/binary, 58>>, TrUserData)
+               end
+           end
     end.
 
 encode_msg_sdl_register_super_ack(Msg, TrUserData) -> encode_msg_sdl_register_super_ack(Msg, <<>>, TrUserData).
@@ -606,8 +617,9 @@ encode_msg_sdl_stun_request(#sdl_stun_request{cookie = F1, client_id = F2, netwo
             true ->
                 begin
                     TrF3 = id(F3, TrUserData),
-                    if TrF3 =:= 0 -> B2;
+                    case is_empty_string(TrF3) of
-                       true -> e_varint(TrF3, <<B2/binary, 24>>, TrUserData)
+                        true -> B2;
+                        false -> e_type_string(TrF3, <<B2/binary, 26>>, TrUserData)
                     end
                 end
          end,
@@ -665,8 +677,9 @@ encode_msg_sdl_data(#sdl_data{network_id = F1, src_mac = F2, dst_mac = F3, is_p2
             true ->
                 begin
                     TrF1 = id(F1, TrUserData),
-                    if TrF1 =:= 0 -> Bin;
+                    case is_empty_string(TrF1) of
-                       true -> e_varint(TrF1, <<Bin/binary, 8>>, TrUserData)
+                        true -> Bin;
+                        false -> e_type_string(TrF1, <<Bin/binary, 10>>, TrUserData)
                     end
                 end
          end,
@@ -727,8 +740,9 @@ encode_msg_sdl_register(#sdl_register{network_id = F1, src_mac = F2, dst_mac = F
             true ->
                 begin
                     TrF1 = id(F1, TrUserData),
-                    if TrF1 =:= 0 -> Bin;
+                    case is_empty_string(TrF1) of
-                       true -> e_varint(TrF1, <<Bin/binary, 8>>, TrUserData)
+                        true -> Bin;
+                        false -> e_type_string(TrF1, <<Bin/binary, 10>>, TrUserData)
                     end
                 end
          end,
@@ -761,8 +775,9 @@ encode_msg_sdl_register_ack(#sdl_register_ack{network_id = F1, src_mac = F2, dst
             true ->
                 begin
                     TrF1 = id(F1, TrUserData),
-                    if TrF1 =:= 0 -> Bin;
+                    case is_empty_string(TrF1) of
-                       true -> e_varint(TrF1, <<Bin/binary, 8>>, TrUserData)
+                        true -> Bin;
+                        false -> e_type_string(TrF1, <<Bin/binary, 10>>, TrUserData)
                     end
                 end
          end,
@@ -1149,9 +1164,9 @@ skip_32_sdl_v6_info(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) ->
 
 skip_64_sdl_v6_info(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_sdl_v6_info(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData).
 
-decode_msg_sdl_dev_addr(Bin, TrUserData) -> dfp_read_field_def_sdl_dev_addr(Bin, 0, 0, 0, id(0, TrUserData), id(<<>>, TrUserData), id(0, TrUserData), id(0, TrUserData), TrUserData).
+decode_msg_sdl_dev_addr(Bin, TrUserData) -> dfp_read_field_def_sdl_dev_addr(Bin, 0, 0, 0, id(<<>>, TrUserData), id(<<>>, TrUserData), id(0, TrUserData), id(0, TrUserData), TrUserData).
 
-dfp_read_field_def_sdl_dev_addr(<<8, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, TrUserData) -> d_field_sdl_dev_addr_network_id(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, TrUserData);
+dfp_read_field_def_sdl_dev_addr(<<10, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, TrUserData) -> d_field_sdl_dev_addr_network_id(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, TrUserData);
 dfp_read_field_def_sdl_dev_addr(<<18, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, TrUserData) -> d_field_sdl_dev_addr_mac(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, TrUserData);
 dfp_read_field_def_sdl_dev_addr(<<24, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, TrUserData) -> d_field_sdl_dev_addr_net_addr(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, TrUserData);
 dfp_read_field_def_sdl_dev_addr(<<32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, TrUserData) -> d_field_sdl_dev_addr_net_bit_len(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, TrUserData);
@@ -1162,7 +1177,7 @@ dg_read_field_def_sdl_dev_addr(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2,
 dg_read_field_def_sdl_dev_addr(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F@_2, F@_3, F@_4, TrUserData) ->
     Key = X bsl N + Acc,
     case Key of
-        8 -> d_field_sdl_dev_addr_network_id(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, TrUserData);
+        10 -> d_field_sdl_dev_addr_network_id(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, TrUserData);
         18 -> d_field_sdl_dev_addr_mac(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, TrUserData);
         24 -> d_field_sdl_dev_addr_net_addr(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, TrUserData);
         32 -> d_field_sdl_dev_addr_net_bit_len(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, TrUserData);
@@ -1179,7 +1194,7 @@ dg_read_field_def_sdl_dev_addr(<<>>, 0, 0, _, F@_1, F@_2, F@_3, F@_4, _) -> #sdl
 
 d_field_sdl_dev_addr_network_id(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, TrUserData) when N < 57 -> d_field_sdl_dev_addr_network_id(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, TrUserData);
 d_field_sdl_dev_addr_network_id(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, F@_2, F@_3, F@_4, TrUserData) ->
-    {NewFValue, RestF} = {id((X bsl N + Acc) band 4294967295, TrUserData), Rest},
+    {NewFValue, RestF} = begin Len = X bsl N + Acc, <<Bytes:Len/binary, Rest2/binary>> = Rest, Bytes2 = binary:copy(Bytes), {id(Bytes2, TrUserData), Rest2} end,
     dfp_read_field_def_sdl_dev_addr(RestF, 0, 0, F, NewFValue, F@_2, F@_3, F@_4, TrUserData).
 
 d_field_sdl_dev_addr_mac(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, TrUserData) when N < 57 -> d_field_sdl_dev_addr_mac(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, TrUserData);
@@ -1248,59 +1263,63 @@ skip_32_sdl_empty(<<_:32, Rest/binary>>, Z1, Z2, F, TrUserData) -> dfp_read_fiel
 
 skip_64_sdl_empty(<<_:64, Rest/binary>>, Z1, Z2, F, TrUserData) -> dfp_read_field_def_sdl_empty(Rest, Z1, Z2, F, TrUserData).
 
-decode_msg_sdl_register_super(Bin, TrUserData) -> dfp_read_field_def_sdl_register_super(Bin, 0, 0, 0, id(0, TrUserData), id(<<>>, TrUserData), id(<<>>, TrUserData), id(undefined, TrUserData), id(<<>>, TrUserData), id(<<>>, TrUserData), TrUserData).
+decode_msg_sdl_register_super(Bin, TrUserData) ->
+    dfp_read_field_def_sdl_register_super(Bin, 0, 0, 0, id(0, TrUserData), id(<<>>, TrUserData), id(<<>>, TrUserData), id(undefined, TrUserData), id(<<>>, TrUserData), id(<<>>, TrUserData), id(<<>>, TrUserData), TrUserData).
 
-dfp_read_field_def_sdl_register_super(<<8, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) -> d_field_sdl_register_super_version(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
+dfp_read_field_def_sdl_register_super(<<8, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData) -> d_field_sdl_register_super_version(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData);
-dfp_read_field_def_sdl_register_super(<<18, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) -> d_field_sdl_register_super_installed_channel(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
+dfp_read_field_def_sdl_register_super(<<18, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData) -> d_field_sdl_register_super_installed_channel(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData);
-dfp_read_field_def_sdl_register_super(<<26, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) -> d_field_sdl_register_super_client_id(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
+dfp_read_field_def_sdl_register_super(<<26, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData) -> d_field_sdl_register_super_client_id(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData);
-dfp_read_field_def_sdl_register_super(<<34, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) -> d_field_sdl_register_super_dev_addr(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
+dfp_read_field_def_sdl_register_super(<<34, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData) -> d_field_sdl_register_super_dev_addr(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData);
-dfp_read_field_def_sdl_register_super(<<42, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) -> d_field_sdl_register_super_pub_key(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
+dfp_read_field_def_sdl_register_super(<<42, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData) -> d_field_sdl_register_super_pub_key(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData);
-dfp_read_field_def_sdl_register_super(<<50, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) -> d_field_sdl_register_super_token(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
+dfp_read_field_def_sdl_register_super(<<50, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData) -> d_field_sdl_register_super_token(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData);
-dfp_read_field_def_sdl_register_super(<<>>, 0, 0, _, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, _) -> #sdl_register_super{version = F@_1, installed_channel = F@_2, client_id = F@_3, dev_addr = F@_4, pub_key = F@_5, token = F@_6};
+dfp_read_field_def_sdl_register_super(<<58, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData) -> d_field_sdl_register_super_network_id(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData);
-dfp_read_field_def_sdl_register_super(Other, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) -> dg_read_field_def_sdl_register_super(Other, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData).
+dfp_read_field_def_sdl_register_super(<<>>, 0, 0, _, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, _) -> #sdl_register_super{version = F@_1, installed_channel = F@_2, client_id = F@_3, dev_addr = F@_4, pub_key = F@_5, token = F@_6, network_id = F@_7};
+dfp_read_field_def_sdl_register_super(Other, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData) -> dg_read_field_def_sdl_register_super(Other, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData).
 
-dg_read_field_def_sdl_register_super(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) when N < 32 - 7 ->
+dg_read_field_def_sdl_register_super(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData) when N < 32 - 7 ->
-    dg_read_field_def_sdl_register_super(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
+    dg_read_field_def_sdl_register_super(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData);
-dg_read_field_def_sdl_register_super(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) ->
+dg_read_field_def_sdl_register_super(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData) ->
     Key = X bsl N + Acc,
     case Key of
-        8 -> d_field_sdl_register_super_version(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
+        8 -> d_field_sdl_register_super_version(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData);
-        18 -> d_field_sdl_register_super_installed_channel(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
+        18 -> d_field_sdl_register_super_installed_channel(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData);
-        26 -> d_field_sdl_register_super_client_id(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
+        26 -> d_field_sdl_register_super_client_id(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData);
-        34 -> d_field_sdl_register_super_dev_addr(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
+        34 -> d_field_sdl_register_super_dev_addr(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData);
-        42 -> d_field_sdl_register_super_pub_key(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
+        42 -> d_field_sdl_register_super_pub_key(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData);
-        50 -> d_field_sdl_register_super_token(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
+        50 -> d_field_sdl_register_super_token(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData);
+        58 -> d_field_sdl_register_super_network_id(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData);
         _ ->
             case Key band 7 of
-                0 -> skip_varint_sdl_register_super(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
+                0 -> skip_varint_sdl_register_super(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData);
-                1 -> skip_64_sdl_register_super(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
+                1 -> skip_64_sdl_register_super(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData);
-                2 -> skip_length_delimited_sdl_register_super(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
+                2 -> skip_length_delimited_sdl_register_super(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData);
-                3 -> skip_group_sdl_register_super(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
+                3 -> skip_group_sdl_register_super(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData);
-                5 -> skip_32_sdl_register_super(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData)
+                5 -> skip_32_sdl_register_super(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData)
             end
     end;
-dg_read_field_def_sdl_register_super(<<>>, 0, 0, _, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, _) -> #sdl_register_super{version = F@_1, installed_channel = F@_2, client_id = F@_3, dev_addr = F@_4, pub_key = F@_5, token = F@_6}.
+dg_read_field_def_sdl_register_super(<<>>, 0, 0, _, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, _) -> #sdl_register_super{version = F@_1, installed_channel = F@_2, client_id = F@_3, dev_addr = F@_4, pub_key = F@_5, token = F@_6, network_id = F@_7}.
 
-d_field_sdl_register_super_version(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) when N < 57 -> d_field_sdl_register_super_version(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
+d_field_sdl_register_super_version(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData) when N < 57 ->
-d_field_sdl_register_super_version(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) ->
+    d_field_sdl_register_super_version(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData);
+d_field_sdl_register_super_version(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData) ->
     {NewFValue, RestF} = {id((X bsl N + Acc) band 4294967295, TrUserData), Rest},
-    dfp_read_field_def_sdl_register_super(RestF, 0, 0, F, NewFValue, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData).
+    dfp_read_field_def_sdl_register_super(RestF, 0, 0, F, NewFValue, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData).
 
-d_field_sdl_register_super_installed_channel(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) when N < 57 ->
+d_field_sdl_register_super_installed_channel(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData) when N < 57 ->
-    d_field_sdl_register_super_installed_channel(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
+    d_field_sdl_register_super_installed_channel(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData);
-d_field_sdl_register_super_installed_channel(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, _, F@_3, F@_4, F@_5, F@_6, TrUserData) ->
+d_field_sdl_register_super_installed_channel(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, _, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData) ->
     {NewFValue, RestF} = begin Len = X bsl N + Acc, <<Bytes:Len/binary, Rest2/binary>> = Rest, Bytes2 = binary:copy(Bytes), {id(Bytes2, TrUserData), Rest2} end,
-    dfp_read_field_def_sdl_register_super(RestF, 0, 0, F, F@_1, NewFValue, F@_3, F@_4, F@_5, F@_6, TrUserData).
+    dfp_read_field_def_sdl_register_super(RestF, 0, 0, F, F@_1, NewFValue, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData).
 
-d_field_sdl_register_super_client_id(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) when N < 57 ->
+d_field_sdl_register_super_client_id(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData) when N < 57 ->
-    d_field_sdl_register_super_client_id(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
+    d_field_sdl_register_super_client_id(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData);
-d_field_sdl_register_super_client_id(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, _, F@_4, F@_5, F@_6, TrUserData) ->
+d_field_sdl_register_super_client_id(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, _, F@_4, F@_5, F@_6, F@_7, TrUserData) ->
     {NewFValue, RestF} = begin Len = X bsl N + Acc, <<Bytes:Len/binary, Rest2/binary>> = Rest, Bytes2 = binary:copy(Bytes), {id(Bytes2, TrUserData), Rest2} end,
-    dfp_read_field_def_sdl_register_super(RestF, 0, 0, F, F@_1, F@_2, NewFValue, F@_4, F@_5, F@_6, TrUserData).
+    dfp_read_field_def_sdl_register_super(RestF, 0, 0, F, F@_1, F@_2, NewFValue, F@_4, F@_5, F@_6, F@_7, TrUserData).
 
-d_field_sdl_register_super_dev_addr(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) when N < 57 ->
+d_field_sdl_register_super_dev_addr(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData) when N < 57 ->
-    d_field_sdl_register_super_dev_addr(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
+    d_field_sdl_register_super_dev_addr(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData);
-d_field_sdl_register_super_dev_addr(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, Prev, F@_5, F@_6, TrUserData) ->
+d_field_sdl_register_super_dev_addr(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, Prev, F@_5, F@_6, F@_7, TrUserData) ->
     {NewFValue, RestF} = begin Len = X bsl N + Acc, <<Bs:Len/binary, Rest2/binary>> = Rest, {id(decode_msg_sdl_dev_addr(Bs, TrUserData), TrUserData), Rest2} end,
     dfp_read_field_def_sdl_register_super(RestF,
                                           0,
@@ -1314,35 +1333,44 @@ d_field_sdl_register_super_dev_addr(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1,
                                           end,
                                           F@_5,
                                           F@_6,
+                                          F@_7,
                                           TrUserData).
 
-d_field_sdl_register_super_pub_key(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) when N < 57 -> d_field_sdl_register_super_pub_key(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
+d_field_sdl_register_super_pub_key(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData) when N < 57 ->
-d_field_sdl_register_super_pub_key(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, _, F@_6, TrUserData) ->
+    d_field_sdl_register_super_pub_key(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData);
+d_field_sdl_register_super_pub_key(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, _, F@_6, F@_7, TrUserData) ->
     {NewFValue, RestF} = begin Len = X bsl N + Acc, <<Bytes:Len/binary, Rest2/binary>> = Rest, Bytes2 = binary:copy(Bytes), {id(Bytes2, TrUserData), Rest2} end,
-    dfp_read_field_def_sdl_register_super(RestF, 0, 0, F, F@_1, F@_2, F@_3, F@_4, NewFValue, F@_6, TrUserData).
+    dfp_read_field_def_sdl_register_super(RestF, 0, 0, F, F@_1, F@_2, F@_3, F@_4, NewFValue, F@_6, F@_7, TrUserData).
 
-d_field_sdl_register_super_token(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) when N < 57 -> d_field_sdl_register_super_token(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
+d_field_sdl_register_super_token(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData) when N < 57 ->
-d_field_sdl_register_super_token(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, _, TrUserData) ->
+    d_field_sdl_register_super_token(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData);
+d_field_sdl_register_super_token(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, _, F@_7, TrUserData) ->
     {NewFValue, RestF} = begin Len = X bsl N + Acc, <<Bytes:Len/binary, Rest2/binary>> = Rest, Bytes2 = binary:copy(Bytes), {id(Bytes2, TrUserData), Rest2} end,
-    dfp_read_field_def_sdl_register_super(RestF, 0, 0, F, F@_1, F@_2, F@_3, F@_4, F@_5, NewFValue, TrUserData).
+    dfp_read_field_def_sdl_register_super(RestF, 0, 0, F, F@_1, F@_2, F@_3, F@_4, F@_5, NewFValue, F@_7, TrUserData).
 
-skip_varint_sdl_register_super(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) -> skip_varint_sdl_register_super(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
+d_field_sdl_register_super_network_id(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData) when N < 57 ->
-skip_varint_sdl_register_super(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) -> dfp_read_field_def_sdl_register_super(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData).
+    d_field_sdl_register_super_network_id(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData);
+d_field_sdl_register_super_network_id(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, _, TrUserData) ->
+    {NewFValue, RestF} = begin Len = X bsl N + Acc, <<Bytes:Len/binary, Rest2/binary>> = Rest, Bytes2 = binary:copy(Bytes), {id(Bytes2, TrUserData), Rest2} end,
+    dfp_read_field_def_sdl_register_super(RestF, 0, 0, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, NewFValue, TrUserData).
 
-skip_length_delimited_sdl_register_super(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) when N < 57 ->
+skip_varint_sdl_register_super(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData) -> skip_varint_sdl_register_super(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData);
-    skip_length_delimited_sdl_register_super(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
+skip_varint_sdl_register_super(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData) -> dfp_read_field_def_sdl_register_super(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData).
-skip_length_delimited_sdl_register_super(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) ->
+
+skip_length_delimited_sdl_register_super(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData) when N < 57 ->
+    skip_length_delimited_sdl_register_super(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData);
+skip_length_delimited_sdl_register_super(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData) ->
     Length = X bsl N + Acc,
     <<_:Length/binary, Rest2/binary>> = Rest,
-    dfp_read_field_def_sdl_register_super(Rest2, 0, 0, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData).
+    dfp_read_field_def_sdl_register_super(Rest2, 0, 0, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData).
 
-skip_group_sdl_register_super(Bin, _, Z2, FNum, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) ->
+skip_group_sdl_register_super(Bin, _, Z2, FNum, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData) ->
     {_, Rest} = read_group(Bin, FNum),
-    dfp_read_field_def_sdl_register_super(Rest, 0, Z2, FNum, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData).
+    dfp_read_field_def_sdl_register_super(Rest, 0, Z2, FNum, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData).
 
-skip_32_sdl_register_super(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) -> dfp_read_field_def_sdl_register_super(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData).
+skip_32_sdl_register_super(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData) -> dfp_read_field_def_sdl_register_super(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData).
 
-skip_64_sdl_register_super(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) -> dfp_read_field_def_sdl_register_super(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData).
+skip_64_sdl_register_super(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData) -> dfp_read_field_def_sdl_register_super(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData).
 
 decode_msg_sdl_register_super_ack(Bin, TrUserData) -> dfp_read_field_def_sdl_register_super_ack(Bin, 0, 0, 0, id(undefined, TrUserData), id(<<>>, TrUserData), id(0, TrUserData), id(undefined, TrUserData), id(undefined, TrUserData), TrUserData).
 
@@ -1952,11 +1980,11 @@ skip_32_sdl_flows(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData
 skip_64_sdl_flows(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> dfp_read_field_def_sdl_flows(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData).
 
 decode_msg_sdl_stun_request(Bin, TrUserData) ->
-    dfp_read_field_def_sdl_stun_request(Bin, 0, 0, 0, id(0, TrUserData), id(<<>>, TrUserData), id(0, TrUserData), id(<<>>, TrUserData), id(0, TrUserData), id(0, TrUserData), id(undefined, TrUserData), TrUserData).
+    dfp_read_field_def_sdl_stun_request(Bin, 0, 0, 0, id(0, TrUserData), id(<<>>, TrUserData), id(<<>>, TrUserData), id(<<>>, TrUserData), id(0, TrUserData), id(0, TrUserData), id(undefined, TrUserData), TrUserData).
 
 dfp_read_field_def_sdl_stun_request(<<8, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData) -> d_field_sdl_stun_request_cookie(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData);
 dfp_read_field_def_sdl_stun_request(<<18, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData) -> d_field_sdl_stun_request_client_id(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData);
-dfp_read_field_def_sdl_stun_request(<<24, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData) -> d_field_sdl_stun_request_network_id(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData);
+dfp_read_field_def_sdl_stun_request(<<26, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData) -> d_field_sdl_stun_request_network_id(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData);
 dfp_read_field_def_sdl_stun_request(<<34, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData) -> d_field_sdl_stun_request_mac(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData);
 dfp_read_field_def_sdl_stun_request(<<40, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData) -> d_field_sdl_stun_request_ip(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData);
 dfp_read_field_def_sdl_stun_request(<<48, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData) -> d_field_sdl_stun_request_nat_type(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData);
@@ -1971,7 +1999,7 @@ dg_read_field_def_sdl_stun_request(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F
     case Key of
         8 -> d_field_sdl_stun_request_cookie(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData);
         18 -> d_field_sdl_stun_request_client_id(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData);
-        24 -> d_field_sdl_stun_request_network_id(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData);
+        26 -> d_field_sdl_stun_request_network_id(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData);
         34 -> d_field_sdl_stun_request_mac(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData);
         40 -> d_field_sdl_stun_request_ip(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData);
         48 -> d_field_sdl_stun_request_nat_type(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData);
@@ -2002,7 +2030,7 @@ d_field_sdl_stun_request_client_id(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, _
 d_field_sdl_stun_request_network_id(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData) when N < 57 ->
     d_field_sdl_stun_request_network_id(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData);
 d_field_sdl_stun_request_network_id(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, _, F@_4, F@_5, F@_6, F@_7, TrUserData) ->
-    {NewFValue, RestF} = {id((X bsl N + Acc) band 4294967295, TrUserData), Rest},
+    {NewFValue, RestF} = begin Len = X bsl N + Acc, <<Bytes:Len/binary, Rest2/binary>> = Rest, Bytes2 = binary:copy(Bytes), {id(Bytes2, TrUserData), Rest2} end,
     dfp_read_field_def_sdl_stun_request(RestF, 0, 0, F, F@_1, F@_2, NewFValue, F@_4, F@_5, F@_6, F@_7, TrUserData).
 
 d_field_sdl_stun_request_mac(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData) when N < 57 -> d_field_sdl_stun_request_mac(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, F@_7, TrUserData);
@@ -2102,9 +2130,9 @@ skip_32_sdl_stun_reply(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> df
 
 skip_64_sdl_stun_reply(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> dfp_read_field_def_sdl_stun_reply(Rest, Z1, Z2, F, F@_1, TrUserData).
 
-decode_msg_sdl_data(Bin, TrUserData) -> dfp_read_field_def_sdl_data(Bin, 0, 0, 0, id(0, TrUserData), id(<<>>, TrUserData), id(<<>>, TrUserData), id(false, TrUserData), id(0, TrUserData), id(<<>>, TrUserData), TrUserData).
+decode_msg_sdl_data(Bin, TrUserData) -> dfp_read_field_def_sdl_data(Bin, 0, 0, 0, id(<<>>, TrUserData), id(<<>>, TrUserData), id(<<>>, TrUserData), id(false, TrUserData), id(0, TrUserData), id(<<>>, TrUserData), TrUserData).
 
-dfp_read_field_def_sdl_data(<<8, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) -> d_field_sdl_data_network_id(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
+dfp_read_field_def_sdl_data(<<10, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) -> d_field_sdl_data_network_id(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
 dfp_read_field_def_sdl_data(<<18, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) -> d_field_sdl_data_src_mac(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
 dfp_read_field_def_sdl_data(<<26, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) -> d_field_sdl_data_dst_mac(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
 dfp_read_field_def_sdl_data(<<32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) -> d_field_sdl_data_is_p2p(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
@@ -2117,7 +2145,7 @@ dg_read_field_def_sdl_data(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_
 dg_read_field_def_sdl_data(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) ->
     Key = X bsl N + Acc,
     case Key of
-        8 -> d_field_sdl_data_network_id(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
+        10 -> d_field_sdl_data_network_id(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
         18 -> d_field_sdl_data_src_mac(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
         26 -> d_field_sdl_data_dst_mac(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
         32 -> d_field_sdl_data_is_p2p(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
@@ -2136,7 +2164,7 @@ dg_read_field_def_sdl_data(<<>>, 0, 0, _, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, _)
 
 d_field_sdl_data_network_id(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) when N < 57 -> d_field_sdl_data_network_id(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
 d_field_sdl_data_network_id(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) ->
-    {NewFValue, RestF} = {id((X bsl N + Acc) band 4294967295, TrUserData), Rest},
+    {NewFValue, RestF} = begin Len = X bsl N + Acc, <<Bytes:Len/binary, Rest2/binary>> = Rest, Bytes2 = binary:copy(Bytes), {id(Bytes2, TrUserData), Rest2} end,
     dfp_read_field_def_sdl_data(RestF, 0, 0, F, NewFValue, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData).
 
 d_field_sdl_data_src_mac(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) when N < 57 -> d_field_sdl_data_src_mac(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData);
@@ -2181,9 +2209,9 @@ skip_32_sdl_data(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5,
 
 skip_64_sdl_data(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) -> dfp_read_field_def_sdl_data(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData).
 
-decode_msg_sdl_register(Bin, TrUserData) -> dfp_read_field_def_sdl_register(Bin, 0, 0, 0, id(0, TrUserData), id(<<>>, TrUserData), id(<<>>, TrUserData), TrUserData).
+decode_msg_sdl_register(Bin, TrUserData) -> dfp_read_field_def_sdl_register(Bin, 0, 0, 0, id(<<>>, TrUserData), id(<<>>, TrUserData), id(<<>>, TrUserData), TrUserData).
 
-dfp_read_field_def_sdl_register(<<8, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> d_field_sdl_register_network_id(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData);
+dfp_read_field_def_sdl_register(<<10, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> d_field_sdl_register_network_id(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData);
 dfp_read_field_def_sdl_register(<<18, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> d_field_sdl_register_src_mac(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData);
 dfp_read_field_def_sdl_register(<<26, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> d_field_sdl_register_dst_mac(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData);
 dfp_read_field_def_sdl_register(<<>>, 0, 0, _, F@_1, F@_2, F@_3, _) -> #sdl_register{network_id = F@_1, src_mac = F@_2, dst_mac = F@_3};
@@ -2193,7 +2221,7 @@ dg_read_field_def_sdl_register(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2,
 dg_read_field_def_sdl_register(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F@_2, F@_3, TrUserData) ->
     Key = X bsl N + Acc,
     case Key of
-        8 -> d_field_sdl_register_network_id(Rest, 0, 0, 0, F@_1, F@_2, F@_3, TrUserData);
+        10 -> d_field_sdl_register_network_id(Rest, 0, 0, 0, F@_1, F@_2, F@_3, TrUserData);
         18 -> d_field_sdl_register_src_mac(Rest, 0, 0, 0, F@_1, F@_2, F@_3, TrUserData);
         26 -> d_field_sdl_register_dst_mac(Rest, 0, 0, 0, F@_1, F@_2, F@_3, TrUserData);
         _ ->
@@ -2209,7 +2237,7 @@ dg_read_field_def_sdl_register(<<>>, 0, 0, _, F@_1, F@_2, F@_3, _) -> #sdl_regis
 
 d_field_sdl_register_network_id(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, TrUserData) when N < 57 -> d_field_sdl_register_network_id(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, TrUserData);
 d_field_sdl_register_network_id(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, F@_2, F@_3, TrUserData) ->
-    {NewFValue, RestF} = {id((X bsl N + Acc) band 4294967295, TrUserData), Rest},
+    {NewFValue, RestF} = begin Len = X bsl N + Acc, <<Bytes:Len/binary, Rest2/binary>> = Rest, Bytes2 = binary:copy(Bytes), {id(Bytes2, TrUserData), Rest2} end,
     dfp_read_field_def_sdl_register(RestF, 0, 0, F, NewFValue, F@_2, F@_3, TrUserData).
 
 d_field_sdl_register_src_mac(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, TrUserData) when N < 57 -> d_field_sdl_register_src_mac(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, TrUserData);
@@ -2239,9 +2267,9 @@ skip_32_sdl_register(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserD
 
 skip_64_sdl_register(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> dfp_read_field_def_sdl_register(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData).
 
-decode_msg_sdl_register_ack(Bin, TrUserData) -> dfp_read_field_def_sdl_register_ack(Bin, 0, 0, 0, id(0, TrUserData), id(<<>>, TrUserData), id(<<>>, TrUserData), TrUserData).
+decode_msg_sdl_register_ack(Bin, TrUserData) -> dfp_read_field_def_sdl_register_ack(Bin, 0, 0, 0, id(<<>>, TrUserData), id(<<>>, TrUserData), id(<<>>, TrUserData), TrUserData).
 
-dfp_read_field_def_sdl_register_ack(<<8, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> d_field_sdl_register_ack_network_id(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData);
+dfp_read_field_def_sdl_register_ack(<<10, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> d_field_sdl_register_ack_network_id(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData);
 dfp_read_field_def_sdl_register_ack(<<18, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> d_field_sdl_register_ack_src_mac(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData);
 dfp_read_field_def_sdl_register_ack(<<26, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> d_field_sdl_register_ack_dst_mac(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData);
 dfp_read_field_def_sdl_register_ack(<<>>, 0, 0, _, F@_1, F@_2, F@_3, _) -> #sdl_register_ack{network_id = F@_1, src_mac = F@_2, dst_mac = F@_3};
@@ -2251,7 +2279,7 @@ dg_read_field_def_sdl_register_ack(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F
 dg_read_field_def_sdl_register_ack(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F@_2, F@_3, TrUserData) ->
     Key = X bsl N + Acc,
     case Key of
-        8 -> d_field_sdl_register_ack_network_id(Rest, 0, 0, 0, F@_1, F@_2, F@_3, TrUserData);
+        10 -> d_field_sdl_register_ack_network_id(Rest, 0, 0, 0, F@_1, F@_2, F@_3, TrUserData);
         18 -> d_field_sdl_register_ack_src_mac(Rest, 0, 0, 0, F@_1, F@_2, F@_3, TrUserData);
         26 -> d_field_sdl_register_ack_dst_mac(Rest, 0, 0, 0, F@_1, F@_2, F@_3, TrUserData);
         _ ->
@@ -2267,7 +2295,7 @@ dg_read_field_def_sdl_register_ack(<<>>, 0, 0, _, F@_1, F@_2, F@_3, _) -> #sdl_r
 
 d_field_sdl_register_ack_network_id(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, TrUserData) when N < 57 -> d_field_sdl_register_ack_network_id(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, TrUserData);
 d_field_sdl_register_ack_network_id(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, F@_2, F@_3, TrUserData) ->
-    {NewFValue, RestF} = {id((X bsl N + Acc) band 4294967295, TrUserData), Rest},
+    {NewFValue, RestF} = begin Len = X bsl N + Acc, <<Bytes:Len/binary, Rest2/binary>> = Rest, Bytes2 = binary:copy(Bytes), {id(Bytes2, TrUserData), Rest2} end,
     dfp_read_field_def_sdl_register_ack(RestF, 0, 0, F, NewFValue, F@_2, F@_3, TrUserData).
 
 d_field_sdl_register_ack_src_mac(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, TrUserData) when N < 57 -> d_field_sdl_register_ack_src_mac(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, TrUserData);
@@ -2545,8 +2573,8 @@ merge_msg_sdl_dev_addr(#sdl_dev_addr{network_id = PFnetwork_id, mac = PFmac, net
 merge_msg_sdl_empty(_Prev, New, _TrUserData) -> New.
 
 -compile({nowarn_unused_function,merge_msg_sdl_register_super/3}).
-merge_msg_sdl_register_super(#sdl_register_super{version = PFversion, installed_channel = PFinstalled_channel, client_id = PFclient_id, dev_addr = PFdev_addr, pub_key = PFpub_key, token = PFtoken},
+merge_msg_sdl_register_super(#sdl_register_super{version = PFversion, installed_channel = PFinstalled_channel, client_id = PFclient_id, dev_addr = PFdev_addr, pub_key = PFpub_key, token = PFtoken, network_id = PFnetwork_id},
-                             #sdl_register_super{version = NFversion, installed_channel = NFinstalled_channel, client_id = NFclient_id, dev_addr = NFdev_addr, pub_key = NFpub_key, token = NFtoken}, TrUserData) ->
+                             #sdl_register_super{version = NFversion, installed_channel = NFinstalled_channel, client_id = NFclient_id, dev_addr = NFdev_addr, pub_key = NFpub_key, token = NFtoken, network_id = NFnetwork_id}, TrUserData) ->
     #sdl_register_super{version =
                             if NFversion =:= undefined -> PFversion;
                                true -> NFversion
@@ -2571,6 +2599,10 @@ merge_msg_sdl_register_super(#sdl_register_super{version = PFversion, installed_
                         token =
                             if NFtoken =:= undefined -> PFtoken;
                                true -> NFtoken
+                            end,
+                        network_id =
+                            if NFnetwork_id =:= undefined -> PFnetwork_id;
+                               true -> NFnetwork_id
                             end}.
 
 -compile({nowarn_unused_function,merge_msg_sdl_register_super_ack/3}).
@@ -2918,7 +2950,7 @@ v_submsg_sdl_dev_addr(Msg, Path, TrUserData) -> v_msg_sdl_dev_addr(Msg, Path, Tr
 -dialyzer({nowarn_function,v_msg_sdl_dev_addr/3}).
 v_msg_sdl_dev_addr(#sdl_dev_addr{network_id = F1, mac = F2, net_addr = F3, net_bit_len = F4}, Path, TrUserData) ->
     if F1 == undefined -> ok;
-       true -> v_type_uint32(F1, [network_id | Path], TrUserData)
+       true -> v_type_string(F1, [network_id | Path], TrUserData)
     end,
     if F2 == undefined -> ok;
        true -> v_type_bytes(F2, [mac | Path], TrUserData)
@@ -2939,7 +2971,7 @@ v_msg_sdl_empty(X, Path, _TrUserData) -> mk_type_error({expected_msg, sdl_empty}
 
 -compile({nowarn_unused_function,v_msg_sdl_register_super/3}).
 -dialyzer({nowarn_function,v_msg_sdl_register_super/3}).
-v_msg_sdl_register_super(#sdl_register_super{version = F1, installed_channel = F2, client_id = F3, dev_addr = F4, pub_key = F5, token = F6}, Path, TrUserData) ->
+v_msg_sdl_register_super(#sdl_register_super{version = F1, installed_channel = F2, client_id = F3, dev_addr = F4, pub_key = F5, token = F6, network_id = F7}, Path, TrUserData) ->
     if F1 == undefined -> ok;
        true -> v_type_uint32(F1, [version | Path], TrUserData)
     end,
@@ -2958,6 +2990,9 @@ v_msg_sdl_register_super(#sdl_register_super{version = F1, installed_channel = F
     if F6 == undefined -> ok;
        true -> v_type_string(F6, [token | Path], TrUserData)
     end,
+    if F7 == undefined -> ok;
+       true -> v_type_string(F7, [network_id | Path], TrUserData)
+    end,
     ok;
 v_msg_sdl_register_super(X, Path, _TrUserData) -> mk_type_error({expected_msg, sdl_register_super}, X, Path).
 
@@ -3109,7 +3144,7 @@ v_msg_sdl_stun_request(#sdl_stun_request{cookie = F1, client_id = F2, network_id
        true -> v_type_string(F2, [client_id | Path], TrUserData)
     end,
     if F3 == undefined -> ok;
-       true -> v_type_uint32(F3, [network_id | Path], TrUserData)
+       true -> v_type_string(F3, [network_id | Path], TrUserData)
     end,
     if F4 == undefined -> ok;
        true -> v_type_bytes(F4, [mac | Path], TrUserData)
@@ -3139,7 +3174,7 @@ v_msg_sdl_stun_reply(X, Path, _TrUserData) -> mk_type_error({expected_msg, sdl_s
 -dialyzer({nowarn_function,v_msg_sdl_data/3}).
 v_msg_sdl_data(#sdl_data{network_id = F1, src_mac = F2, dst_mac = F3, is_p2p = F4, ttl = F5, data = F6}, Path, TrUserData) ->
     if F1 == undefined -> ok;
-       true -> v_type_uint32(F1, [network_id | Path], TrUserData)
+       true -> v_type_string(F1, [network_id | Path], TrUserData)
     end,
     if F2 == undefined -> ok;
        true -> v_type_bytes(F2, [src_mac | Path], TrUserData)
@@ -3163,7 +3198,7 @@ v_msg_sdl_data(X, Path, _TrUserData) -> mk_type_error({expected_msg, sdl_data},
 -dialyzer({nowarn_function,v_msg_sdl_register/3}).
 v_msg_sdl_register(#sdl_register{network_id = F1, src_mac = F2, dst_mac = F3}, Path, TrUserData) ->
     if F1 == undefined -> ok;
-       true -> v_type_uint32(F1, [network_id | Path], TrUserData)
+       true -> v_type_string(F1, [network_id | Path], TrUserData)
     end,
     if F2 == undefined -> ok;
        true -> v_type_bytes(F2, [src_mac | Path], TrUserData)
@@ -3178,7 +3213,7 @@ v_msg_sdl_register(X, Path, _TrUserData) -> mk_type_error({expected_msg, sdl_reg
 -dialyzer({nowarn_function,v_msg_sdl_register_ack/3}).
 v_msg_sdl_register_ack(#sdl_register_ack{network_id = F1, src_mac = F2, dst_mac = F3}, Path, TrUserData) ->
     if F1 == undefined -> ok;
-       true -> v_type_uint32(F1, [network_id | Path], TrUserData)
+       true -> v_type_string(F1, [network_id | Path], TrUserData)
     end,
     if F2 == undefined -> ok;
        true -> v_type_bytes(F2, [src_mac | Path], TrUserData)
@@ -3291,7 +3326,7 @@ get_msg_defs() ->
        #field{name = nat_type, fnum = 3, rnum = 4, type = uint32, occurrence = defaulty, opts = []}]},
      {{msg, sdl_v6_info}, [#field{name = port, fnum = 1, rnum = 2, type = uint32, occurrence = defaulty, opts = []}, #field{name = v6, fnum = 2, rnum = 3, type = bytes, occurrence = defaulty, opts = []}]},
      {{msg, sdl_dev_addr},
-      [#field{name = network_id, fnum = 1, rnum = 2, type = uint32, occurrence = defaulty, opts = []},
+      [#field{name = network_id, fnum = 1, rnum = 2, type = string, occurrence = defaulty, opts = []},
        #field{name = mac, fnum = 2, rnum = 3, type = bytes, occurrence = defaulty, opts = []},
        #field{name = net_addr, fnum = 3, rnum = 4, type = uint32, occurrence = defaulty, opts = []},
        #field{name = net_bit_len, fnum = 4, rnum = 5, type = uint32, occurrence = defaulty, opts = []}]},
@@ -3302,7 +3337,8 @@ get_msg_defs() ->
        #field{name = client_id, fnum = 3, rnum = 4, type = string, occurrence = defaulty, opts = []},
        #field{name = dev_addr, fnum = 4, rnum = 5, type = {msg, sdl_dev_addr}, occurrence = defaulty, opts = []},
        #field{name = pub_key, fnum = 5, rnum = 6, type = string, occurrence = defaulty, opts = []},
-       #field{name = token, fnum = 6, rnum = 7, type = string, occurrence = defaulty, opts = []}]},
+       #field{name = token, fnum = 6, rnum = 7, type = string, occurrence = defaulty, opts = []},
+       #field{name = network_id, fnum = 7, rnum = 8, type = string, occurrence = defaulty, opts = []}]},
      {{msg, sdl_register_super_ack},
       [#field{name = dev_addr, fnum = 1, rnum = 2, type = {msg, sdl_dev_addr}, occurrence = defaulty, opts = []},
        #field{name = aes_key, fnum = 2, rnum = 3, type = bytes, occurrence = defaulty, opts = []},
@@ -3332,25 +3368,25 @@ get_msg_defs() ->
      {{msg, sdl_stun_request},
       [#field{name = cookie, fnum = 1, rnum = 2, type = uint32, occurrence = defaulty, opts = []},
        #field{name = client_id, fnum = 2, rnum = 3, type = string, occurrence = defaulty, opts = []},
-       #field{name = network_id, fnum = 3, rnum = 4, type = uint32, occurrence = defaulty, opts = []},
+       #field{name = network_id, fnum = 3, rnum = 4, type = string, occurrence = defaulty, opts = []},
        #field{name = mac, fnum = 4, rnum = 5, type = bytes, occurrence = defaulty, opts = []},
        #field{name = ip, fnum = 5, rnum = 6, type = uint32, occurrence = defaulty, opts = []},
        #field{name = nat_type, fnum = 6, rnum = 7, type = uint32, occurrence = defaulty, opts = []},
        #field{name = v6_info, fnum = 7, rnum = 8, type = {msg, sdl_v6_info}, occurrence = optional, opts = []}]},
      {{msg, sdl_stun_reply}, [#field{name = cookie, fnum = 1, rnum = 2, type = uint32, occurrence = defaulty, opts = []}]},
      {{msg, sdl_data},
-      [#field{name = network_id, fnum = 1, rnum = 2, type = uint32, occurrence = defaulty, opts = []},
+      [#field{name = network_id, fnum = 1, rnum = 2, type = string, occurrence = defaulty, opts = []},
        #field{name = src_mac, fnum = 2, rnum = 3, type = bytes, occurrence = defaulty, opts = []},
        #field{name = dst_mac, fnum = 3, rnum = 4, type = bytes, occurrence = defaulty, opts = []},
        #field{name = is_p2p, fnum = 4, rnum = 5, type = bool, occurrence = defaulty, opts = []},
        #field{name = ttl, fnum = 5, rnum = 6, type = uint32, occurrence = defaulty, opts = []},
        #field{name = data, fnum = 6, rnum = 7, type = bytes, occurrence = defaulty, opts = []}]},
      {{msg, sdl_register},
-      [#field{name = network_id, fnum = 1, rnum = 2, type = uint32, occurrence = defaulty, opts = []},
+      [#field{name = network_id, fnum = 1, rnum = 2, type = string, occurrence = defaulty, opts = []},
        #field{name = src_mac, fnum = 2, rnum = 3, type = bytes, occurrence = defaulty, opts = []},
        #field{name = dst_mac, fnum = 3, rnum = 4, type = bytes, occurrence = defaulty, opts = []}]},
      {{msg, sdl_register_ack},
-      [#field{name = network_id, fnum = 1, rnum = 2, type = uint32, occurrence = defaulty, opts = []},
+      [#field{name = network_id, fnum = 1, rnum = 2, type = string, occurrence = defaulty, opts = []},
        #field{name = src_mac, fnum = 2, rnum = 3, type = bytes, occurrence = defaulty, opts = []},
        #field{name = dst_mac, fnum = 3, rnum = 4, type = bytes, occurrence = defaulty, opts = []}]},
      {{msg, sdl_stun_probe}, [#field{name = cookie, fnum = 1, rnum = 2, type = uint32, occurrence = defaulty, opts = []}, #field{name = attr, fnum = 2, rnum = 3, type = uint32, occurrence = defaulty, opts = []}]},
@@ -3433,7 +3469,7 @@ find_msg_def(sdl_v4_info) ->
      #field{name = nat_type, fnum = 3, rnum = 4, type = uint32, occurrence = defaulty, opts = []}];
 find_msg_def(sdl_v6_info) -> [#field{name = port, fnum = 1, rnum = 2, type = uint32, occurrence = defaulty, opts = []}, #field{name = v6, fnum = 2, rnum = 3, type = bytes, occurrence = defaulty, opts = []}];
 find_msg_def(sdl_dev_addr) ->
-    [#field{name = network_id, fnum = 1, rnum = 2, type = uint32, occurrence = defaulty, opts = []},
+    [#field{name = network_id, fnum = 1, rnum = 2, type = string, occurrence = defaulty, opts = []},
      #field{name = mac, fnum = 2, rnum = 3, type = bytes, occurrence = defaulty, opts = []},
      #field{name = net_addr, fnum = 3, rnum = 4, type = uint32, occurrence = defaulty, opts = []},
      #field{name = net_bit_len, fnum = 4, rnum = 5, type = uint32, occurrence = defaulty, opts = []}];
@@ -3444,7 +3480,8 @@ find_msg_def(sdl_register_super) ->
      #field{name = client_id, fnum = 3, rnum = 4, type = string, occurrence = defaulty, opts = []},
      #field{name = dev_addr, fnum = 4, rnum = 5, type = {msg, sdl_dev_addr}, occurrence = defaulty, opts = []},
      #field{name = pub_key, fnum = 5, rnum = 6, type = string, occurrence = defaulty, opts = []},
-     #field{name = token, fnum = 6, rnum = 7, type = string, occurrence = defaulty, opts = []}];
+     #field{name = token, fnum = 6, rnum = 7, type = string, occurrence = defaulty, opts = []},
+     #field{name = network_id, fnum = 7, rnum = 8, type = string, occurrence = defaulty, opts = []}];
 find_msg_def(sdl_register_super_ack) ->
     [#field{name = dev_addr, fnum = 1, rnum = 2, type = {msg, sdl_dev_addr}, occurrence = defaulty, opts = []},
      #field{name = aes_key, fnum = 2, rnum = 3, type = bytes, occurrence = defaulty, opts = []},
@@ -3474,25 +3511,25 @@ find_msg_def(sdl_flows) ->
 find_msg_def(sdl_stun_request) ->
     [#field{name = cookie, fnum = 1, rnum = 2, type = uint32, occurrence = defaulty, opts = []},
      #field{name = client_id, fnum = 2, rnum = 3, type = string, occurrence = defaulty, opts = []},
-     #field{name = network_id, fnum = 3, rnum = 4, type = uint32, occurrence = defaulty, opts = []},
+     #field{name = network_id, fnum = 3, rnum = 4, type = string, occurrence = defaulty, opts = []},
      #field{name = mac, fnum = 4, rnum = 5, type = bytes, occurrence = defaulty, opts = []},
      #field{name = ip, fnum = 5, rnum = 6, type = uint32, occurrence = defaulty, opts = []},
      #field{name = nat_type, fnum = 6, rnum = 7, type = uint32, occurrence = defaulty, opts = []},
      #field{name = v6_info, fnum = 7, rnum = 8, type = {msg, sdl_v6_info}, occurrence = optional, opts = []}];
 find_msg_def(sdl_stun_reply) -> [#field{name = cookie, fnum = 1, rnum = 2, type = uint32, occurrence = defaulty, opts = []}];
 find_msg_def(sdl_data) ->
-    [#field{name = network_id, fnum = 1, rnum = 2, type = uint32, occurrence = defaulty, opts = []},
+    [#field{name = network_id, fnum = 1, rnum = 2, type = string, occurrence = defaulty, opts = []},
      #field{name = src_mac, fnum = 2, rnum = 3, type = bytes, occurrence = defaulty, opts = []},
      #field{name = dst_mac, fnum = 3, rnum = 4, type = bytes, occurrence = defaulty, opts = []},
      #field{name = is_p2p, fnum = 4, rnum = 5, type = bool, occurrence = defaulty, opts = []},
      #field{name = ttl, fnum = 5, rnum = 6, type = uint32, occurrence = defaulty, opts = []},
      #field{name = data, fnum = 6, rnum = 7, type = bytes, occurrence = defaulty, opts = []}];
 find_msg_def(sdl_register) ->
-    [#field{name = network_id, fnum = 1, rnum = 2, type = uint32, occurrence = defaulty, opts = []},
+    [#field{name = network_id, fnum = 1, rnum = 2, type = string, occurrence = defaulty, opts = []},
      #field{name = src_mac, fnum = 2, rnum = 3, type = bytes, occurrence = defaulty, opts = []},
      #field{name = dst_mac, fnum = 3, rnum = 4, type = bytes, occurrence = defaulty, opts = []}];
 find_msg_def(sdl_register_ack) ->
-    [#field{name = network_id, fnum = 1, rnum = 2, type = uint32, occurrence = defaulty, opts = []},
+    [#field{name = network_id, fnum = 1, rnum = 2, type = string, occurrence = defaulty, opts = []},
      #field{name = src_mac, fnum = 2, rnum = 3, type = bytes, occurrence = defaulty, opts = []},
      #field{name = dst_mac, fnum = 3, rnum = 4, type = bytes, occurrence = defaulty, opts = []}];
 find_msg_def(sdl_stun_probe) -> [#field{name = cookie, fnum = 1, rnum = 2, type = uint32, occurrence = defaulty, opts = []}, #field{name = attr, fnum = 2, rnum = 3, type = uint32, occurrence = defaulty, opts = []}];

apps/sdlan/src/sdlan_sup.erl

@@ -47,15 +47,15 @@ init([]) ->
         }
     ],
 
-    {ok, {SupFlags, pools() ++ Specs ++ stun_specs()}}.
+    {ok, {SupFlags, Specs ++ stun_specs()}}.
 
 %% internal functions
 
-pools() ->
+%pools() ->
-    {ok, Pools} = application:get_env(sdlan, pools),
+%    {ok, Pools} = application:get_env(sdlan, pools),
-    lists:map(fun({Name, PoolArgs, WorkerArgs}) ->
+%    lists:map(fun({Name, PoolArgs, WorkerArgs}) ->
-        poolboy:child_spec(Name, [{name, {local, Name}}|PoolArgs], WorkerArgs)
+%        poolboy:child_spec(Name, [{name, {local, Name}}|PoolArgs], WorkerArgs)
-              end, Pools).
+%              end, Pools).
 
 stun_specs() ->
     {ok, StunServers} = application:get_env(sdlan, stun_servers),

config/sys-dev.config

@@ -2,14 +2,14 @@
   {sdlan, [
 
     {http_server, [
-      {port, 18082},
+      {port, 19082},
       {acceptors, 500},
       {max_connections, 10240},
       {backlog, 10240}
     ]},
 
     {tcp_server, [
-      {port, 18083},
+      {port, 19083},
       {acceptors, 500},
       {max_connections, 10240},
       {backlog, 10240}
@@ -21,26 +21,7 @@
     {stun_servers, [{'sdlan_stun:1:1', 1265}, {'sdlan_stun:1:2', 1266}]},
     {stun_assist, {{47,98,178,3}, 1266}},
 
-    % {stun_servers, [{'sdlan_stun:2:1', 1265}, {'sdlan_stun:2:2', 1266}]},
+    {api_url, "http://127.0.0.1:19082/test/"}
-
-    {pools, [
-      %% mysql连接池配置
-      {mysql_sdlan,
-        [{size, 10}, {max_overflow, 20}, {worker_module, mysql}],
-        [
-          {host, {39, 98, 184, 67}},
-          {port, 3306},
-          {user, "sdlanuser"},
-          {connect_mode, lazy},
-          {keep_alive, true},
-          {password, "sdlan@J1c8WGu"},
-          {database, "sdlan"},
-          {queries, [<<"set names utf8">>]}
-        ]
-      }
-    ]},
-
-    {api_url, "http://127.0.0.1:18082/test/"}
 
   ]},
 

config/sys-prod.config

@@ -23,25 +23,7 @@
 
     % {stun_servers, [{'sdlan_stun:2:1', 1265}, {'sdlan_stun:2:2', 1266}]},
 
-    {pools, [
-      %% mysql连接池配置
-      {mysql_sdlan,
-        [{size, 10}, {max_overflow, 20}, {worker_module, mysql}],
-        [
-          {host, {118, 178, 229, 213}},
-          {port, 3306},
-          {user, "sdlanuser"},
-          {connect_mode, lazy},
-          {keep_alive, true},
-          {password, "sdlan@J1c8WGu"},
-          {database, "sdlan"},
-          {queries, [<<"set names utf8">>]}
-        ]
-      }
-    ]},
-
     {api_url, "https://punchnet.aioe.tech/api/"}
-
   ]},
 
   {throttle, [

message.proto

@@ -15,7 +15,7 @@ message SDLV6Info {
 
 // 设备网络地址信息
 message SDLDevAddr {
-    uint32 network_id = 1;
+    string network_id = 1;
     bytes mac = 2;
     uint32 net_addr = 3;
     uint32 net_bit_len = 4;
@@ -33,6 +33,7 @@ message SDLRegisterSuper {
     SDLDevAddr dev_addr = 4;
     string pub_key = 5;
     string token = 6;
+    string network_id = 7;
 }
 
 message SDLRegisterSuperAck {
@@ -106,7 +107,7 @@ message SDLFlows {
 message SDLStunRequest {
     uint32 cookie = 1;
     string client_id = 2;
-    uint32 network_id = 3;
+    string network_id = 3;
     bytes mac = 4;
     uint32 ip = 5;
     uint32 nat_type = 6;
@@ -118,7 +119,7 @@ message SDLStunReply {
 }
 
 message SDLData {
-    uint32 network_id = 1;
+    string network_id = 1;
     bytes src_mac = 2;
     bytes dst_mac = 3;
     bool is_p2p = 4;
@@ -127,13 +128,13 @@ message SDLData {
 }
 
 message SDLRegister {
-    uint32 network_id = 1;
+    string network_id = 1;
     bytes src_mac = 2;
     bytes dst_mac = 3;
 }
 
 message SDLRegisterAck {
-    uint32 network_id = 1;
+    string network_id = 1;
     bytes src_mac = 2;
     bytes dst_mac = 3;
 }

rebar.config

@@ -3,9 +3,8 @@
     {poolboy, ".*", {git, "https://github.com/devinus/poolboy.git", {tag, "1.5.1"}}},
     {hackney, ".*", {git, "https://github.com/benoitc/hackney.git", {tag, "1.16.0"}}},
     {sync, ".*", {git, "https://github.com/rustyio/sync.git", {branch, "master"}}},
-    {esockd, ".*", {git, "https://github.com/emqx/esockd.git", {tag, "v5.7.3"}}},
     {jiffy, ".*", {git, "https://github.com/davisp/jiffy.git", {tag, "1.1.1"}}},
-    {cowboy, ".*", {git, "https://github.com/ninenines/cowboy.git", {tag, "2.12.0"}}},
+    {cowboy, ".*", {git, "https://github.com/ninenines/cowboy.git", {tag, "2.14.2"}}},
     {mysql, ".*", {git, "https://github.com/mysql-otp/mysql-otp", {tag, "1.8.0"}}},
     {gpb, ".*", {git, "https://github.com/tomas-abrahamsson/gpb.git", {tag, "4.21.1"}}},
     {throttle, ".*", {git, "https://github.com/lambdaclass/throttle.git", {tag, "0.3.0"}}},

rebar.lock

@@ -2,16 +2,12 @@
 [{<<"certifi">>,{pkg,<<"certifi">>,<<"2.5.2">>},1},
  {<<"cowboy">>,
   {git,"https://github.com/ninenines/cowboy.git",
-       {ref,"3ea8395eb8f53a57acb5d3c00b99c70296e7cdbd"}},
+       {ref,"495e74ada88d0876d7e438d53f11af767a9cdcc4"}},
   0},
  {<<"cowlib">>,
   {git,"https://github.com/ninenines/cowlib",
-       {ref,"1eb7f4293a652adcfe43b1835d22c58d8def839f"}},
+       {ref,"aca0ad953417b29bab2c41eeb4c37c98606c848b"}},
   1},
- {<<"esockd">>,
-  {git,"https://github.com/emqx/esockd.git",
-       {ref,"d9ce4024cc42a65e9a05001997031e743442f955"}},
-  0},
  {<<"fs">>,{pkg,<<"fs">>,<<"6.1.1">>},1},
  {<<"goldrush">>,{pkg,<<"goldrush">>,<<"0.1.9">>},1},
  {<<"gpb">>,
@@ -47,7 +43,7 @@
   0},
  {<<"ranch">>,
   {git,"https://github.com/ninenines/ranch",
-       {ref,"a692f44567034dacf5efcaa24a24183788594eb7"}},
+       {ref,"10b51304b26062e0dbfd5e74824324e9a911e269"}},
   1},
  {<<"ssl_verify_fun">>,{pkg,<<"ssl_verify_fun">>,<<"1.1.6">>},1},
  {<<"sync">>,