nitro/G-Earth
1
0
Fork 0
mirror of https://github.com/sirjonasxx/G-Earth.git synced 2024-11-27 02:40:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add support to send multiple packets at once in injection

Browse Source 
* Each line represents a packet

Signed-off-by: Eduardo Alonso <edu@error404software.com>
This commit is contained in:
Eduardo Alonso 2018-12-31 14:12:52 +01:00
parent 0afbaac944
commit c9728df9d6
2 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
G-Earth/src/main/java/gearth/ui/injection/Injection.java
View File

@ -25,19 +25,32 @@ public class Injection extends SubForm {
} }
private void updateUI() { private void updateUI() {
HPacket packet = new HPacket(inputPacket.getText()); boolean dirty = false;
if (!packet.isCorrupted()) { String[] rawPackets = inputPacket.getText().split("\n");
HPacket[] packets = new HPacket[rawPackets.length];
lbl_corrruption.setText("isCorrupted: False"); lbl_corrruption.setText("isCorrupted: False");
lbl_corrruption.setFill(Paint.valueOf("Green")); lbl_corrruption.setFill(Paint.valueOf("Green"));
lbl_pcktInfo.setText("header (id:"+packet.headerId()+", length:"+packet.length()+")");
for (int i = 0; i < packets.length; i++) {
packets[i] = new HPacket(rawPackets[i]);
if (packets[i].isCorrupted()) {
if (!dirty) {
lbl_corrruption.setText("isCorrupted: True -> " + i);
lbl_corrruption.setFill(Paint.valueOf("#ee0404b2"));
dirty = true;
} else
lbl_corrruption.setText(lbl_corrruption.getText() + ", " + i);
}
}
if (!dirty) {
btn_sendToClient.setDisable(getHConnection().getState() != HConnection.State.CONNECTED); btn_sendToClient.setDisable(getHConnection().getState() != HConnection.State.CONNECTED);
btn_sendToServer.setDisable(getHConnection().getState() != HConnection.State.CONNECTED); btn_sendToServer.setDisable(getHConnection().getState() != HConnection.State.CONNECTED);
} lbl_pcktInfo.setText("header (id:" + packets[packets.length - 1].headerId() + ", length:" +
else { packets[packets.length - 1].length() + ")");
lbl_corrruption.setText("isCorrupted: True"); } else {
lbl_corrruption.setFill(Paint.valueOf("#ee0404b2")); lbl_pcktInfo.setText("header (id:NULL, length:" + packets[packets.length - 1].getBytesLength()+")");
lbl_pcktInfo.setText("header (id:NULL, length:"+packet.getBytesLength()+")");
btn_sendToClient.setDisable(true); btn_sendToClient.setDisable(true);
btn_sendToServer.setDisable(true); btn_sendToServer.setDisable(true);
@ -46,14 +59,20 @@ public class Injection extends SubForm {
} }
public void sendToServer_clicked(ActionEvent actionEvent) { public void sendToServer_clicked(ActionEvent actionEvent) {
HPacket packet = new HPacket(inputPacket.getText()); String[] rawPackets = inputPacket.getText().split("\n");
for (String rawPacket : rawPackets) {
HPacket packet = new HPacket(rawPacket);
getHConnection().sendToServerAsync(packet); getHConnection().sendToServerAsync(packet);
writeToLog(Color.BLUE, "SS -> packet with id: " + packet.headerId()); writeToLog(Color.BLUE, "SS -> packet with id: " + packet.headerId());
} }
}
public void sendToClient_clicked(ActionEvent actionEvent) { public void sendToClient_clicked(ActionEvent actionEvent) {
HPacket packet = new HPacket(inputPacket.getText()); String[] rawPackets = inputPacket.getText().split("\n");
for (String rawPacket : rawPackets) {
HPacket packet = new HPacket(rawPacket);
getHConnection().sendToClientAsync(packet); getHConnection().sendToClientAsync(packet);
writeToLog(Color.RED, "CS -> packet with id: " + packet.headerId()); writeToLog(Color.RED, "CS -> packet with id: " + packet.headerId());
} }
}
} }

1
G-Earth/src/main/resources/gearth/ui/injection/Injection.fxml
View File

@ -9,6 +9,7 @@
<?import javafx.scene.text.Font?> <?import javafx.scene.text.Font?>
<?import javafx.scene.text.Text?> <?import javafx.scene.text.Text?>
<?import javafx.scene.text.TextFlow?>
<GridPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="262.0" prefWidth="565.0" <GridPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="262.0" prefWidth="565.0"
xmlns="http://javafx.com/javafx/8.0.112" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8.0.112" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="gearth.ui.injection.Injection"> fx:controller="gearth.ui.injection.Injection">