PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

Stab in dark at forge + more client mod support.

Browse Source
This commit is contained in:
md_5 2012-11-12 17:21:09 +11:00
parent 6b984e052d
commit 96a5287e5b
3 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/net/md_5/bungee/InitialHandler.java
View File

@ -3,6 +3,8 @@ package net.md_5.bungee;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.net.Socket; import java.net.Socket;
import java.util.ArrayList;
import java.util.List;
import javax.crypto.SecretKey; import javax.crypto.SecretKey;
import net.md_5.bungee.packet.Packet2Handshake; import net.md_5.bungee.packet.Packet2Handshake;
import net.md_5.bungee.packet.PacketFCEncryptionResponse; import net.md_5.bungee.packet.PacketFCEncryptionResponse;
@ -66,14 +68,14 @@ public class InitialHandler implements Runnable
out.write(new PacketFCEncryptionResponse().getPacket()); out.write(new PacketFCEncryptionResponse().getPacket());
in = new PacketInputStream(new CipherInputStream(socket.getInputStream(), EncryptionUtil.getCipher(false, shared))); in = new PacketInputStream(new CipherInputStream(socket.getInputStream(), EncryptionUtil.getCipher(false, shared)));
out = new CipherOutputStream(socket.getOutputStream(), EncryptionUtil.getCipher(true, shared)); out = new CipherOutputStream(socket.getOutputStream(), EncryptionUtil.getCipher(true, shared));
List<byte[]> customPackets = new ArrayList<>();
int ciphId = Util.getId(in.readPacket()); byte[] custom;
if (ciphId != 0xCD) while (Util.getId((custom = in.readPacket())) != 0xCD)
{ {
throw new KickException("Unable to receive encrypted client status"); customPackets.add(custom);
} }
UserConnection userCon = new UserConnection(socket, in, out, handshake); UserConnection userCon = new UserConnection(socket, in, out, handshake, customPackets);
userCon.connect(BungeeCord.instance.config.getServer(handshake.username, handshake.host)); userCon.connect(BungeeCord.instance.config.getServer(handshake.username, handshake.host));
break; break;
case 0xFE: case 0xFE:

9
src/main/java/net/md_5/bungee/ServerConnection.java
View File

@ -32,7 +32,7 @@ public class ServerConnection extends GenericConnection
this.loginPacket = loginPacket; this.loginPacket = loginPacket;
} }
public static ServerConnection connect(String name, InetSocketAddress address, Packet2Handshake handshake, boolean retry) public static ServerConnection connect(UserConnection user, String name, InetSocketAddress address, Packet2Handshake handshake, boolean retry)
{ {
try try
{ {
@ -61,6 +61,11 @@ public class ServerConnection extends GenericConnection
in = new PacketInputStream(new CipherInputStream(socket.getInputStream(), EncryptionUtil.getCipher(false, myKey))); in = new PacketInputStream(new CipherInputStream(socket.getInputStream(), EncryptionUtil.getCipher(false, myKey)));
out = new CipherOutputStream(out, EncryptionUtil.getCipher(true, myKey)); out = new CipherOutputStream(out, EncryptionUtil.getCipher(true, myKey));
for (byte[] custom : user.loginPackets)
{
out.write(custom);
}
out.write(new PacketCDClientStatus((byte) 0).getPacket()); out.write(new PacketCDClientStatus((byte) 0).getPacket());
byte[] loginResponse = in.readPacket(); byte[] loginResponse = in.readPacket();
if (Util.getId(loginResponse) == 0xFF) if (Util.getId(loginResponse) == 0xFF)
@ -79,7 +84,7 @@ public class ServerConnection extends GenericConnection
InetSocketAddress def = BungeeCord.instance.config.getServer(null); InetSocketAddress def = BungeeCord.instance.config.getServer(null);
if (retry && !address.equals(def)) if (retry && !address.equals(def))
{ {
return connect(name, def, handshake, false); return connect(user, name, def, handshake, false);
} else } else
{ {
throw new RuntimeException("Could not connect to target server"); throw new RuntimeException("Could not connect to target server");

8
src/main/java/net/md_5/bungee/UserConnection.java
View File

@ -5,6 +5,8 @@ import java.io.OutputStream;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.net.Socket; import java.net.Socket;
import java.net.SocketAddress; import java.net.SocketAddress;
import java.util.ArrayList;
import java.util.List;
import java.util.Queue; import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ConcurrentLinkedQueue;
import net.md_5.bungee.command.CommandSender; import net.md_5.bungee.command.CommandSender;
@ -24,6 +26,7 @@ public class UserConnection extends GenericConnection implements CommandSender
public final Packet2Handshake handshake; public final Packet2Handshake handshake;
public Queue<DefinedPacket> packetQueue = new ConcurrentLinkedQueue<>(); public Queue<DefinedPacket> packetQueue = new ConcurrentLinkedQueue<>();
public List<byte[]> loginPackets = new ArrayList<>();
private ServerConnection server; private ServerConnection server;
private UpstreamBridge upBridge; private UpstreamBridge upBridge;
private DownstreamBridge downBridge; private DownstreamBridge downBridge;
@ -36,11 +39,12 @@ public class UserConnection extends GenericConnection implements CommandSender
private long pingTime; private long pingTime;
private int ping; private int ping;
public UserConnection(Socket socket, PacketInputStream in, OutputStream out, Packet2Handshake handshake) public UserConnection(Socket socket, PacketInputStream in, OutputStream out, Packet2Handshake handshake, List<byte[]> loginPackets)
{ {
super(socket, in, out); super(socket, in, out);
this.handshake = handshake; this.handshake = handshake;
username = handshake.username; username = handshake.username;
this.loginPackets = loginPackets;
BungeeCord.instance.connections.put(username, this); BungeeCord.instance.connections.put(username, this);
BungeeCord.instance.tabListHandler.onJoin(this); BungeeCord.instance.tabListHandler.onJoin(this);
} }
@ -81,7 +85,7 @@ public class UserConnection extends GenericConnection implements CommandSender
out.write(new Packet9Respawn((byte) -1, (byte) 0, (byte) 0, (short) 256, "DEFAULT").getPacket()); out.write(new Packet9Respawn((byte) -1, (byte) 0, (byte) 0, (short) 256, "DEFAULT").getPacket());
} }
ServerConnection newServer = ServerConnection.connect(name, serverAddr, handshake, server == null); ServerConnection newServer = ServerConnection.connect(this, name, serverAddr, handshake, server == null);
if (server == null) if (server == null)
{ {
clientEntityId = newServer.loginPacket.entityId; clientEntityId = newServer.loginPacket.entityId;