Skip to content

Add connection timeout argument #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LeonidMem wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add connection timeout argument #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>net.kronos.rkon.core</groupId>
<artifactId>rkon-core</artifactId>
<version>1.2</version>
<version>1.3</version>

<properties>
<maven.compiler.source>11</maven.compiler.source>
Expand Down
42 changes: 37 additions & 5 deletions src/main/java/net/kronos/rkon/core/Rcon.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package net.kronos.rkon.core;

import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
Expand Down Expand Up @@ -29,11 +30,40 @@ public class Rcon {
* @throws AuthenticationException
*/
public Rcon(String host, int port, byte[] password) throws IOException, AuthenticationException {
this(host, port, password, 0);
}

/**
* Create, connect and authenticate a new Rcon object
*
* @param host Rcon server address
* @param port Rcon server port
* @param password Rcon server password
* @param timeout Rcon socket connection timeout
*
* @throws IOException
* @throws AuthenticationException
*/
public Rcon(String host, int port, byte[] password, int timeout) throws IOException, AuthenticationException {
// Default charset is utf8
this.charset = StandardCharsets.UTF_8;

// Connect to host
this.connect(host, port, password);
this.connect(host, port, password, timeout);
}

/**
* Connect to a rcon server
*
* @param host Rcon server address
* @param port Rcon server port
* @param password Rcon server password
*
* @throws IOException
* @throws AuthenticationException
*/
public void connect(String host, int port, byte[] password) throws IOException, AuthenticationException {
connect(host, port, password, 0);
}

/**
Expand All @@ -42,11 +72,12 @@ public Rcon(String host, int port, byte[] password) throws IOException, Authenti
* @param host Rcon server address
* @param port Rcon server port
* @param password Rcon server password
*
* @param timeout Rcon socket connection timeout
*
* @throws IOException
* @throws AuthenticationException
*/
public void connect(String host, int port, byte[] password) throws IOException, AuthenticationException {
public void connect(String host, int port, byte[] password, int timeout) throws IOException, AuthenticationException {
if(host == null || host.trim().isEmpty()) {
throw new IllegalArgumentException("Host can't be null or empty");
}
Expand All @@ -61,7 +92,8 @@ public void connect(String host, int port, byte[] password) throws IOException,
this.requestId = rand.nextInt();

// We can't reuse a socket, so we need a new one
this.socket = new Socket(host, port);
this.socket = new Socket();
socket.connect(new InetSocketAddress(host, port), timeout);
}

// Send the auth packet
Expand Down