Skip to content

Commit

Permalink
Fix typos in master server packet names
Browse files Browse the repository at this point in the history
  • Loading branch information
@koraktor
koraktor committed Feb 4, 2018
1 parent f2473db commit 20e2b0f
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 56 deletions.
22 changes: 11 additions & 11 deletions src/main/java/com/github/koraktor/steamcondenser/servers/MasterServer.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/**
/*
* This code is free software; you can redistribute it and/or modify it under
* the terms of the new BSD License.
*
* Copyright (c) 2008-2015, Sebastian Staudt
* Copyright (c) 2008-2018, Sebastian Staudt
*/

package com.github.koraktor.steamcondenser.servers;
Expand All @@ -18,16 +18,16 @@
import org.slf4j.LoggerFactory;

import com.github.koraktor.steamcondenser.exceptions.SteamCondenserException;
import com.github.koraktor.steamcondenser.servers.packets.A2M_GET_SERVERS_BATCH2_Paket;
import com.github.koraktor.steamcondenser.servers.packets.M2A_SERVER_BATCH_Paket;
import com.github.koraktor.steamcondenser.servers.packets.A2M_GET_SERVERS_BATCH2_Packet;
import com.github.koraktor.steamcondenser.servers.packets.M2A_SERVER_BATCH_Packet;
import com.github.koraktor.steamcondenser.servers.sockets.MasterServerSocket;

/**
* This class represents a Steam master server and can be used to get game
* servers which are publicly available
* <p/>
* An intance of this class can be used much like Steam's server browser to get
* a list of available game servers, including filters to narrow down the
* An instance of this class can be used much like Steam's server browser to
* get a list of available game servers, including filters to narrow down the
* search results.
*
* @author Sebastian Staudt
Expand Down Expand Up @@ -165,7 +165,7 @@ public MasterServer(InetAddress address, Integer port)
*
* @return A list of game servers matching the given
* region and filters
* @see A2M_GET_SERVERS_BATCH2_Paket
* @see A2M_GET_SERVERS_BATCH2_Packet
* @throws SteamCondenserException if the request fails
* @throws TimeoutException if too many timeouts occur while querying the
* master server
Expand All @@ -192,7 +192,7 @@ public Set<InetSocketAddress> getServers()
* @param filter The filters that game servers should match
* @return A list of game servers matching the given
* region and filters
* @see A2M_GET_SERVERS_BATCH2_Paket
* @see A2M_GET_SERVERS_BATCH2_Packet
* @throws SteamCondenserException if the request fails
* @throws TimeoutException if too many timeouts occur while querying the
* master server
Expand Down Expand Up @@ -232,7 +232,7 @@ public Set<InetSocketAddress> getServers(byte regionCode, String filter)
* @param filter The filters that game servers should match
* @return A list of game servers matching the given
* region and filters
* @see A2M_GET_SERVERS_BATCH2_Paket
* @see A2M_GET_SERVERS_BATCH2_Packet
* @throws SteamCondenserException if the request fails
* @throws TimeoutException if too many timeouts occur while querying the
* master server
Expand All @@ -250,9 +250,9 @@ public Set<InetSocketAddress> getServers(byte regionCode, String filter, boolean
try {
failCount = 0;
do {
this.socket.send(new A2M_GET_SERVERS_BATCH2_Paket(regionCode, hostName + ":" + portNumber, filter));
this.socket.send(new A2M_GET_SERVERS_BATCH2_Packet(regionCode, hostName + ":" + portNumber, filter));
try {
serverStringArray = ((M2A_SERVER_BATCH_Paket) this.socket.getReply()).getServers();
serverStringArray = ((M2A_SERVER_BATCH_Packet) this.socket.getReply()).getServers();

for(String serverString : serverStringArray) {
hostName = serverString.substring(0, serverString.lastIndexOf(":"));
Expand Down
17 changes: 5 additions & 12 deletions ...packets/A2M_GET_SERVERS_BATCH2_Paket.java → ...ackets/A2M_GET_SERVERS_BATCH2_Packet.java
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
/**
/*
* This code is free software; you can redistribute it and/or modify it under
* the terms of the new BSD License.
*
* Copyright (c) 2008-2013, Sebastian Staudt
* Copyright (c) 2008-2018, Sebastian Staudt
*/

package com.github.koraktor.steamcondenser.servers.packets;

import com.github.koraktor.steamcondenser.servers.MasterServer;
Expand Down Expand Up @@ -36,20 +37,12 @@
* @author Sebastian Staudt
* @see MasterServer#getServers(byte, String)
*/
public class A2M_GET_SERVERS_BATCH2_Paket extends SteamPacket {
public class A2M_GET_SERVERS_BATCH2_Packet extends SteamPacket {

private String filter;
private byte regionCode;
private String startIp;

/**
* Creates a new A2M_GET_SERVERS_BATCH2 request object without applying any
* filters
*/
public A2M_GET_SERVERS_BATCH2_Paket() {
this(MasterServer.REGION_ALL, "0.0.0.0:0", "");
}

/**
* Creates a new A2M_GET_SERVERS_BATCH2 request object, filtering by the
* given paramters
Expand All @@ -59,7 +52,7 @@ public A2M_GET_SERVERS_BATCH2_Paket() {
* server or 0.0.0.0
* @param filter The filters to apply in the form ("\filtername\value...")
*/
public A2M_GET_SERVERS_BATCH2_Paket(byte regionCode, String startIp, String filter) {
public A2M_GET_SERVERS_BATCH2_Packet(byte regionCode, String startIp, String filter) {
super(SteamPacket.A2M_GET_SERVERS_BATCH2_HEADER);

this.filter = filter;
Expand Down
4 changes: 2 additions & 2 deletions ...rvers/packets/M2A_SERVER_BATCH_Paket.java → ...vers/packets/M2A_SERVER_BATCH_Packet.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
* @author Sebastian Staudt
* @see com.github.koraktor.steamcondenser.servers.MasterServer#getServers
*/
public class M2A_SERVER_BATCH_Paket extends SteamPacket {
public class M2A_SERVER_BATCH_Packet extends SteamPacket {

private Vector<String> serverArray;

Expand All @@ -31,7 +31,7 @@ public class M2A_SERVER_BATCH_Paket extends SteamPacket {
* @param data The raw packet data replied from the server
* @throws PacketFormatException if the packet data is not well formatted
*/
public M2A_SERVER_BATCH_Paket(byte[] data)
public M2A_SERVER_BATCH_Packet(byte[] data)
throws PacketFormatException {
super(SteamPacket.M2A_SERVER_BATCH_HEADER, data);

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/github/koraktor/steamcondenser/servers/packets/SteamPacketFactory.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/**
/*
* This code is free software; you can redistribute it and/or modify it under
* the terms of the new BSD License.
*
* Copyright (c) 2008-2013, Sebastian Staudt
* Copyright (c) 2008-2018, Sebastian Staudt
*/

package com.github.koraktor.steamcondenser.servers.packets;
Expand Down Expand Up @@ -72,7 +72,7 @@ public static SteamPacket getPacketFromData(byte[] rawData)
return new S2C_CHALLENGE_Packet(data);

case SteamPacket.M2A_SERVER_BATCH_HEADER:
return new M2A_SERVER_BATCH_Paket(data);
return new M2A_SERVER_BATCH_Packet(data);

case SteamPacket.RCON_GOLDSRC_CHALLENGE_HEADER:
case SteamPacket.RCON_GOLDSRC_NO_CHALLENGE_HEADER:
Expand Down
56 changes: 28 additions & 28 deletions src/test/java/com/github/koraktor/steamcondenser/servers/MasterServerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
import org.hamcrest.BaseMatcher;
import org.hamcrest.Description;

import com.github.koraktor.steamcondenser.servers.packets.A2M_GET_SERVERS_BATCH2_Paket;
import com.github.koraktor.steamcondenser.servers.packets.M2A_SERVER_BATCH_Paket;
import com.github.koraktor.steamcondenser.servers.packets.A2M_GET_SERVERS_BATCH2_Packet;
import com.github.koraktor.steamcondenser.servers.packets.M2A_SERVER_BATCH_Packet;
import com.github.koraktor.steamcondenser.servers.sockets.MasterServerSocket;

import static org.hamcrest.core.Is.is;
Expand Down Expand Up @@ -55,13 +55,13 @@ public void setup() throws Exception {

@Test
public void testGetServers() throws Exception {
M2A_SERVER_BATCH_Paket packet1 = mock(M2A_SERVER_BATCH_Paket.class);
M2A_SERVER_BATCH_Packet packet1 = mock(M2A_SERVER_BATCH_Packet.class);
Vector<String> servers1 = new Vector<>();
servers1.add("127.0.0.1:27015");
servers1.add("127.0.0.2:27015");
servers1.add("127.0.0.3:27015");
when(packet1.getServers()).thenReturn(servers1);
M2A_SERVER_BATCH_Paket packet2 = mock(M2A_SERVER_BATCH_Paket.class);
M2A_SERVER_BATCH_Packet packet2 = mock(M2A_SERVER_BATCH_Packet.class);
Vector<String> servers2 = new Vector<>();
servers2.add("127.0.0.4:27015");
servers2.add("0.0.0.0:0");
Expand All @@ -76,23 +76,23 @@ public void testGetServers() throws Exception {

assertThat(this.server.getServers(MasterServer.REGION_EUROPE, "filter"), is(equalTo(servers)));

verify(this.server.socket).send(argThat(new BaseMatcher<A2M_GET_SERVERS_BATCH2_Paket>() {
verify(this.server.socket).send(argThat(new BaseMatcher<A2M_GET_SERVERS_BATCH2_Packet>() {
public boolean matches(Object o) {
if(!(o instanceof A2M_GET_SERVERS_BATCH2_Paket)) {
if(!(o instanceof A2M_GET_SERVERS_BATCH2_Packet)) {
return false;
}
A2M_GET_SERVERS_BATCH2_Paket packet = (A2M_GET_SERVERS_BATCH2_Paket) o;
A2M_GET_SERVERS_BATCH2_Packet packet = (A2M_GET_SERVERS_BATCH2_Packet) o;
return Arrays.equals(packet.getBytes(), "\u0031\u00030.0.0.0:0\0filter\0".getBytes());
}

public void describeTo(Description description) {}
}));
verify(this.server.socket).send(argThat(new BaseMatcher<A2M_GET_SERVERS_BATCH2_Paket>() {
verify(this.server.socket).send(argThat(new BaseMatcher<A2M_GET_SERVERS_BATCH2_Packet>() {
public boolean matches(Object o) {
if(!(o instanceof A2M_GET_SERVERS_BATCH2_Paket)) {
if(!(o instanceof A2M_GET_SERVERS_BATCH2_Packet)) {
return false;
}
A2M_GET_SERVERS_BATCH2_Paket packet = (A2M_GET_SERVERS_BATCH2_Paket) o;
A2M_GET_SERVERS_BATCH2_Packet packet = (A2M_GET_SERVERS_BATCH2_Packet) o;
return Arrays.equals(packet.getBytes(), "\u0031\u0003127.0.0.3:27015\0filter\0".getBytes());
}

Expand All @@ -104,7 +104,7 @@ public void describeTo(Description description) {}
public void testGetServersForced() throws Exception {
MasterServer.setRetries(1);

M2A_SERVER_BATCH_Paket packet1 = mock(M2A_SERVER_BATCH_Paket.class);
M2A_SERVER_BATCH_Packet packet1 = mock(M2A_SERVER_BATCH_Packet.class);
Vector<String> servers1 = new Vector<>();
servers1.add("127.0.0.1:27015");
servers1.add("127.0.0.2:27015");
Expand All @@ -119,23 +119,23 @@ public void testGetServersForced() throws Exception {

assertThat(this.server.getServers(MasterServer.REGION_EUROPE, "filter", true), is(equalTo(servers)));

verify(this.server.socket).send(argThat(new BaseMatcher<A2M_GET_SERVERS_BATCH2_Paket>() {
verify(this.server.socket).send(argThat(new BaseMatcher<A2M_GET_SERVERS_BATCH2_Packet>() {
public boolean matches(Object o) {
if(!(o instanceof A2M_GET_SERVERS_BATCH2_Paket)) {
if(!(o instanceof A2M_GET_SERVERS_BATCH2_Packet)) {
return false;
}
A2M_GET_SERVERS_BATCH2_Paket packet = (A2M_GET_SERVERS_BATCH2_Paket) o;
A2M_GET_SERVERS_BATCH2_Packet packet = (A2M_GET_SERVERS_BATCH2_Packet) o;
return Arrays.equals(packet.getBytes(), "\u0031\u00030.0.0.0:0\0filter\0".getBytes());
}

public void describeTo(Description description) {}
}));
verify(this.server.socket).send(argThat(new BaseMatcher<A2M_GET_SERVERS_BATCH2_Paket>() {
verify(this.server.socket).send(argThat(new BaseMatcher<A2M_GET_SERVERS_BATCH2_Packet>() {
public boolean matches(Object o) {
if(!(o instanceof A2M_GET_SERVERS_BATCH2_Paket)) {
if(!(o instanceof A2M_GET_SERVERS_BATCH2_Packet)) {
return false;
}
A2M_GET_SERVERS_BATCH2_Paket packet = (A2M_GET_SERVERS_BATCH2_Paket) o;
A2M_GET_SERVERS_BATCH2_Packet packet = (A2M_GET_SERVERS_BATCH2_Packet) o;
return Arrays.equals(packet.getBytes(), "\u0031\u0003127.0.0.3:27015\0filter\0".getBytes());
}

Expand All @@ -145,13 +145,13 @@ public void describeTo(Description description) {}

@Test
public void testGetServersSwapIp() throws Exception {
M2A_SERVER_BATCH_Paket packet1 = mock(M2A_SERVER_BATCH_Paket.class);
M2A_SERVER_BATCH_Packet packet1 = mock(M2A_SERVER_BATCH_Packet.class);
Vector<String> servers1 = new Vector<>();
servers1.add("127.0.0.1:27015");
servers1.add("127.0.0.2:27015");
servers1.add("127.0.0.3:27015");
when(packet1.getServers()).thenReturn(servers1);
M2A_SERVER_BATCH_Paket packet2 = mock(M2A_SERVER_BATCH_Paket.class);
M2A_SERVER_BATCH_Packet packet2 = mock(M2A_SERVER_BATCH_Packet.class);
Vector<String> servers2 = new Vector<>();
servers2.add("127.0.0.4:27015");
servers2.add("0.0.0.0:0");
Expand All @@ -174,23 +174,23 @@ public void testGetServersSwapIp() throws Exception {
assertThat(this.server.getServers(MasterServer.REGION_EUROPE, "filter"), is(equalTo(servers)));

verify(this.server, times(3)).rotateIp();
verify(this.server.socket).send(argThat(new BaseMatcher<A2M_GET_SERVERS_BATCH2_Paket>() {
verify(this.server.socket).send(argThat(new BaseMatcher<A2M_GET_SERVERS_BATCH2_Packet>() {
public boolean matches(Object o) {
if(!(o instanceof A2M_GET_SERVERS_BATCH2_Paket)) {
if(!(o instanceof A2M_GET_SERVERS_BATCH2_Packet)) {
return false;
}
A2M_GET_SERVERS_BATCH2_Paket packet = (A2M_GET_SERVERS_BATCH2_Paket) o;
A2M_GET_SERVERS_BATCH2_Packet packet = (A2M_GET_SERVERS_BATCH2_Packet) o;
return Arrays.equals(packet.getBytes(), "\u0031\u00030.0.0.0:0\0filter\0".getBytes());
}

public void describeTo(Description description) {}
}));
verify(this.server.socket, times(4)).send(argThat(new BaseMatcher<A2M_GET_SERVERS_BATCH2_Paket>() {
verify(this.server.socket, times(4)).send(argThat(new BaseMatcher<A2M_GET_SERVERS_BATCH2_Packet>() {
public boolean matches(Object o) {
if(!(o instanceof A2M_GET_SERVERS_BATCH2_Paket)) {
if(!(o instanceof A2M_GET_SERVERS_BATCH2_Packet)) {
return false;
}
A2M_GET_SERVERS_BATCH2_Paket packet = (A2M_GET_SERVERS_BATCH2_Paket) o;
A2M_GET_SERVERS_BATCH2_Packet packet = (A2M_GET_SERVERS_BATCH2_Packet) o;
return Arrays.equals(packet.getBytes(), "\u0031\u0003127.0.0.3:27015\0filter\0".getBytes());
}

Expand All @@ -210,12 +210,12 @@ public void testGetServersTimeout() throws Exception {
fail();
} catch(TimeoutException e) {}

verify(this.server.socket, times(retries)).send(argThat(new BaseMatcher<A2M_GET_SERVERS_BATCH2_Paket>() {
verify(this.server.socket, times(retries)).send(argThat(new BaseMatcher<A2M_GET_SERVERS_BATCH2_Packet>() {
public boolean matches(Object o) {
if(!(o instanceof A2M_GET_SERVERS_BATCH2_Paket)) {
if(!(o instanceof A2M_GET_SERVERS_BATCH2_Packet)) {
return false;
}
A2M_GET_SERVERS_BATCH2_Paket packet = (A2M_GET_SERVERS_BATCH2_Paket) o;
A2M_GET_SERVERS_BATCH2_Packet packet = (A2M_GET_SERVERS_BATCH2_Packet) o;
return Arrays.equals(packet.getBytes(), new byte[] { 0x31, (byte) 0xFF, 0x30, 0x2E, 0x30, 0x2E, 0x30, 0x2E, 0x30, 0x3a, 0x30, 0x00, 0x00 });
}

Expand Down

0 comments on commit 20e2b0f

Please sign in to comment.