Fix net ids export string (#316)

Author: macpie

src/cli/hpr_cli_info.erl

@@ -67,7 +67,7 @@ info_ips(["info", "ips"], [], []) ->
         end,
         gproc:lookup_local_properties(hpr_packet_router_service:ip_key())
     ),
-    Json = jsx:encode(List),
+    Json = jsx:encode(List, [{indent, 2}]),
     case file:open("/tmp/hotspot_ip.json", [write]) of
         {ok, File} ->
             file:write(File, Json),
@@ -83,14 +83,14 @@ info_netids(["info", "netids"], [], []) ->
     List = lists:map(
         fun({NetID, Count}) ->
             #{
-                net_id_str => hpr_utils:net_id_display(NetID),
+                net_id_str => erlang:list_to_binary(hpr_utils:net_id_display(NetID)),
                 net_id_int => NetID,
                 count => Count
             }
         end,
         hpr_netid_stats:export()
     ),
-    Json = jsx:encode(List),
+    Json = jsx:encode(List, [{indent, 2}]),
     case file:open("/tmp/net_ids.json", [write]) of
         {ok, File} ->
             file:write(File, Json),

src/grpc/packet_router/hpr_packet_up.erl

@@ -171,10 +171,10 @@ type(Packet) ->
 -spec net_id(Packet :: packet()) -> {ok, lora_subnet:net_id()} | {error, any()}.
 net_id(Packet) ->
     case ?MODULE:payload(Packet) of
-        <<?JOIN_REQUEST:3, _:5, _AppEUI:64/integer-unsigned-little,
-            _DevEUI:64/integer-unsigned-little, _DevNonce:2/binary, _MIC:4/binary>> ->
+        <<?JOIN_REQUEST:3, _:5, _AppEUI:64/little-unsigned-integer,
+            _DevEUI:64/little-unsigned-integer, _DevNonce:2/binary, _MIC:4/binary>> ->
             {error, join};
-        (<<FType:3, _:5, DevAddr:32/integer-unsigned-little, _ADR:1, _ADRACKReq:1, _ACK:1, _RFU:1,
+        (<<FType:3, _:5, DevAddr:32/little-unsigned-integer, _ADR:1, _ADRACKReq:1, _ACK:1, _RFU:1,
             FOptsLen:4, _FCnt:16/little-unsigned-integer, _FOpts:FOptsLen/binary,
             PayloadAndMIC/binary>>) when
             (FType == ?UNCONFIRMED_UP orelse FType == ?CONFIRMED_UP) andalso