Skip to content
This repository was archived by the owner on Sep 19, 2021. It is now read-only.

Fixed OSC Server/Client connection for new api calls #103

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Fixed OSC Server/Client connection for new api calls #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2d9226
Fixed Port Number and Protocol: 10009/UDP
GHPS Nov 12, 2019
89e9b30
Wrong outgoing Client Port Number corrected (Fixes Conflicting Addres…
GHPS Nov 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pixelcontroller-cli/src/main/java/com/neophob/sematrix/cli/PixConClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ protected PixConClient(ParsedArgument cmd) throws OscServerException, OscClientE
}

// send request
rmi.startClient(NETWORK_PROTOCOL, cmd.getHostname(), cmd.getPort(), LOCAL_SERVER_PORT);
rmi.startClient(NETWORK_PROTOCOL, cmd.getHostname(), cmd.getPort(), 0);
Command cmdAndParameter = new Command(cmd.getCommand(), new String[] { cmd.getParameter() });
rmi.sendPayload(cmdAndParameter, null);

Expand Down Expand Up @@ -203,4 +203,4 @@ public static void main(String[] args) throws Exception {
new PixConClient(cmd);
}

}
}
10 changes: 7 additions & 3 deletions pixelcontroller-core/src/main/java/com/neophob/sematrix/core/osc/OscReplyManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,20 +81,24 @@ private void sendOscMessage(ValidCommand cmd) throws OscClientException {

// handle all "INTERNAL" commands, eg. API calls
public void handleClientResponse(OscMessage oscIn, String[] msg) throws OscClientException {
Protocol NETWORK_PROTOCOL = Protocol.UDP;
int LOCAL_SERVER_PORT = 10009;
ValidCommand cmd = ValidCommand.valueOf(msg[0]);
Command command = new Command(cmd);

if (oscIn != null) {
InetSocketAddress currentTarget = (InetSocketAddress) oscIn.getSocketAddress();
int clientPort = currentTarget.getPort();

if (!currentClientIp.equalsIgnoreCase(currentTarget.getHostName())) {
LOG.log(Level.INFO, "New Client connection, IP: {0}/{1}, Port: {2}", new Object[] {
remoteServer.getClientTargetIp(), currentTarget.getHostName(), clientPort });
remoteServer.startClient(Protocol.TCP, currentTarget.getHostName(), clientPort, 0);
remoteServer.getClientTargetIp(), currentTarget.getHostName(), LOCAL_SERVER_PORT });
remoteServer.startClient(NETWORK_PROTOCOL, currentTarget.getHostName(), LOCAL_SERVER_PORT, 0);
currentClientIp = currentTarget.getHostName();
}
}

LOG.log(Level.INFO, cmd.toString() + " received.");

switch (cmd) {
case GET_CONFIGURATION:
remoteServer.sendPayload(command, pixelController.getConfig());
Expand Down