Skip to content

Commit

Permalink
Minor formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
bmalinowsky committed Aug 25, 2024
1 parent 13f8e18 commit 4ac1078
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
2 changes: 0 additions & 2 deletions src/io/calimero/knxnetip/KNXnetIPTunnel.java
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,6 @@ public void send(final CEMI frame, final BlockingMode mode)
}

// sends a tunneling feature-get service
// sendFeature / getFeature?
public void send(final InterfaceFeature feature) throws KNXConnectionClosedException, KNXTimeoutException,
InterruptedException {
lock.lock();
Expand All @@ -232,7 +231,6 @@ public void send(final InterfaceFeature feature) throws KNXConnectionClosedExcep
}

// sends a tunneling feature-set service
// sendFeature / setFeature?
public void send(final InterfaceFeature feature, final byte... featureValue)
throws KNXConnectionClosedException, KNXTimeoutException, InterruptedException {
lock.lock();
Expand Down
4 changes: 2 additions & 2 deletions src/io/calimero/link/KNXNetworkLinkIP.java
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ public class KNXNetworkLinkIP extends AbstractLink<KNXnetIPConnection>
* @param remoteEP the remote endpoint of the link to communicate with; this is the KNXnet/IP server control
* endpoint
* @param useNAT {@code true} to use network address translation (NAT) in tunneling service mode,
* {@code false} to use the default (non aware) mode
* {@code false} to use the default (non-aware) mode
* @param settings medium settings defining device and KNX medium specifics for communication
* @return the network link in open state
* @throws KNXException on failure establishing link using the KNXnet/IP connection
Expand Down Expand Up @@ -613,7 +613,7 @@ private static InetAddress mcastGroup(final InetSocketAddress remoteEP) {

private static String createLinkName(final InetSocketAddress endpt)
{
if (endpt == null)
if (endpt == null) // TODO distinguish UDS, where endpt is also null
return KNXnetIPRouting.DEFAULT_MULTICAST;
// do our own IP:port string, since InetAddress.toString() always prepends a '/'
final String host = (endpt.isUnresolved() ? endpt.getHostString() : endpt.getAddress().getHostAddress());
Expand Down
1 change: 1 addition & 0 deletions test/testnetwork-launcher/server-config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
networkMonitoring="true" udpPort="3671" keyfile="../calimero-core/test/resources/keyfile" securedServices="optional">
<knxAddress type="individual">1.1.0</knxAddress>
<routing>224.0.23.12</routing>
<!-- <unixSocket>/tmp/calimero/unix/.socket</unixSocket>-->
<disruptionBuffer expirationTimeout="30" udpPort="5555-5559"/>
<knxSubnet type="virtual" medium="pl110" domainAddress="6c">KnxTestNetwork</knxSubnet>
<groupAddressFilter>
Expand Down

0 comments on commit 4ac1078

Please sign in to comment.