Sync to GitHub

Author: CI

lib/bacnet/stack/transport/ethernet_transport.ex

@@ -222,11 +222,12 @@ defmodule BACnet.Stack.Transport.EthernetTransport do
   @doc """
   Checks whether the given destination is an address that needs to be routed.
 
-  Always returns `false` due to how Ethernet works (no routing).
+  Returns true for any non-valid `mac_address()`, because they need
+  to be routed by a BACnet router residing on this transport layer/network.
   """
   @spec destination_routed?(GenServer.server(), mac_address() | term()) :: boolean()
-  def destination_routed?(transport, _destination) when is_server(transport) do
-    false
+  def destination_routed?(transport, destination) when is_server(transport) do
+    not valid_destination?(destination)
   end
 
   @doc """

lib/bacnet/stack/transport/ipv4_transport.ex

@@ -343,7 +343,7 @@ defmodule BACnet.Stack.Transport.IPv4Transport do
   """
   @spec destination_routed?(GenServer.server(), iplink_address() | term()) :: boolean()
   def destination_routed?(transport, destination) when is_server(transport) do
-    GenServer.call(transport, {:destination_routed?, destination})
+    GenServer.call(transport, {:is_destination_routed, destination})
   end
 
   @doc """
@@ -585,10 +585,10 @@ defmodule BACnet.Stack.Transport.IPv4Transport do
     {:reply, {state.broadcast_addr, state.local_port}, state}
   end
 
-  def handle_call({:destination_routed?, {destination, _port}}, _from, %State{} = state)
+  def handle_call({:is_destination_routed, {destination, _port}}, _from, %State{} = state)
       when is_tuple(destination) and tuple_size(destination) == 4 do
     log_debug(fn ->
-      "BacIPv4Transport: Received destination_routed? request for #{inspect(destination)}"
+      "BacIPv4Transport: Received is_destination_routed request for #{inspect(destination)}"
     end)
 
     routed =
@@ -600,9 +600,9 @@ defmodule BACnet.Stack.Transport.IPv4Transport do
     {:reply, routed, state}
   end
 
-  def handle_call({:destination_routed?, destination}, _from, state) do
+  def handle_call({:is_destination_routed, destination}, _from, state) do
     log_debug(fn ->
-      "BacIPv4Transport: Received (non-IP) destination_routed? request for #{inspect(destination)}"
+      "BacIPv4Transport: Received (non-IP) is_destination_routed request for #{inspect(destination)}"
     end)
 
     {:reply, true, state}

lib/bacnet/stack/transport/mstp_transport.ex

@@ -613,18 +613,20 @@ if Code.ensure_loaded?(Circuits.UART) do
 
     @doc """
     Checks whether the given destination is an address that needs to be routed.
+
+    Returns true for any non-valid `destination_address()`, because they need
+    to be routed by a BACnet router residing on this transport layer/network.
     """
     @spec destination_routed?(GenServer.server(), destination_address() | term()) ::
             boolean()
     def destination_routed?(transport, destination) when is_server(transport) do
-      # GenServer.call(transport, {:destination_routed?, destination})
       not valid_destination?(destination)
     end
 
     @doc """
     Verifies whether the given destination is valid for the transport module.
     """
-    @spec valid_destination?(destination_address()) :: boolean()
+    @spec valid_destination?(destination_address() | term()) :: boolean()
     def valid_destination?(destination) do
       is_integer(destination) and destination >= 0 and destination <= 255
     end
@@ -1401,23 +1403,6 @@ if Code.ensure_loaded?(Circuits.UART) do
       {:reply, state.local_address, state}
     end
 
-    def handle_call({:destination_routed?, destination}, _from, %State{} = state)
-        when is_integer(destination) do
-      log_debug(fn ->
-        "BacMstpTransport: Received destination_routed? request for #{inspect(destination)}"
-      end)
-
-      {:reply, not valid_destination?(destination), state}
-    end
-
-    def handle_call({:destination_routed?, destination}, _from, state) do
-      log_debug(fn ->
-        "BacMstpTransport: Received (non-MSTP) destination_routed? request for #{inspect(destination)}"
-      end)
-
-      {:reply, true, state}
-    end
-
     def handle_call(
           {:send, destination, send_and_wait, data, _data_length, invoke_id},
           _from,