From b65310399f772a94a8053b9b1dc9f52a1ffa8455 Mon Sep 17 00:00:00 2001
From: Maximilien LEDOUX <m.ledoux@student.helmo.be>
Date: Sat, 19 Mar 2022 12:36:28 +0100
Subject: [PATCH] =?UTF-8?q?Nouvelles=20Regex=20:=20HELLO=20valid=C3=A9e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../protocol/rules/reader/HelloRule.java        |  6 ++++--
 app/src/main/resources/appdata.json             | 17 ++++++++++++++++-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/lightcontainer/protocol/rules/reader/HelloRule.java b/app/src/main/java/lightcontainer/protocol/rules/reader/HelloRule.java
index 4c0aa4b..fbed0e3 100644
--- a/app/src/main/java/lightcontainer/protocol/rules/reader/HelloRule.java
+++ b/app/src/main/java/lightcontainer/protocol/rules/reader/HelloRule.java
@@ -3,12 +3,14 @@ package lightcontainer.protocol.rules.reader;
 import lightcontainer.domains.client.Context;
 import lightcontainer.protocol.ProtocolReader;
 
+import static lightcontainer.protocol.StandardizedDefinitions.SBE_HELLO;
+
 /**
  * Règle permettant d'être alerter de l'annoncement d'un SBE
  */
 public class HelloRule extends ProtocolReader {
-
-    private static final String PATTERN = "^HELLO ([A-Za-z0-9.]{5,20}) ([\\d]{0,5})\r\n$";
+    //"^HELLO ([A-Za-z0-9.]{5,20}) ([\\d]{0,5})\r\n$"
+    private static final String PATTERN = SBE_HELLO;
 
     private static final String NAME = "HELLO";
 
diff --git a/app/src/main/resources/appdata.json b/app/src/main/resources/appdata.json
index e26d31b..a99218c 100644
--- a/app/src/main/resources/appdata.json
+++ b/app/src/main/resources/appdata.json
@@ -1 +1,16 @@
-{"unicast_port":8000,"multicast_ip":"224.66.66.1","multicast_port":15502,"network_interface":"lo","tls":true,"storagePath":"D:\\ffe","users":[{"name":"aaaaa","password":"$2a$10$HAupXer5aVEDgIAtFQchyOSB.SyCq7irV7EZNcMTE3R9k.1UJGOLu","aes_key":"FvsflaQGR+OoV11chJTCxd24owRPvyz1T42JXIU9fwE=","files":[{"name":"map_91.dat","fileNameSalt":"vtUOlQQ6Vt4bbpNexyBvog==","size":693,"iv":"ylk0R79Fq2/eDccVi8GTfA==","storage":["orglightcont01"]},{"name":"OutPutStream.mp3","fileNameSalt":"3qw+LauZUc13xh6fwnMHnQ==","size":53037,"iv":"40sIX0VtASM9man5XkM64Q==","storage":["orglightcont01"]},{"name":"wait.mp4","fileNameSalt":"1wnuehjUPI895TgCy2e/EQ==","size":1210962,"iv":"fCM6WG1PxOu9ieEjPuQiFg==","storage":["orglightcont01"]},{"name":"loader.gif","fileNameSalt":"05nNafgD/SNPg+y/MzI2DA==","size":89594,"iv":"GLoY4/PybIz72Sbz9jFgRQ==","storage":["orglightcont01"]},{"name":"extensions.mp4","fileNameSalt":"BYam5baM4WUPdaQZDu2eyw==","size":1501471,"iv":"ugCXHr7yVsY8rnB1znEfew==","storage":["orglightcont01"]},{"name":"007.mp4","fileNameSalt":"12jEfd3/dT9akqzdWn1vsg==","size":1742707,"iv":"CyKf2OHPABn//ez5L2o3Jg==","storage":["orglightcont01"]}]}]}
\ No newline at end of file
+{
+  "unicast_port": 8000,
+  "multicast_ip": "224.66.66.1",
+  "multicast_port": 15502,
+  "network_interface": "lo",
+  "tls": true,
+  "storagePath": "C:\\Users\\ledou\\Documents\\ffe",
+  "users": [
+    {
+      "name": "aaaaa",
+      "password": "$2a$10$Tuh5xmGEy0g26hQO1SHNY.TNy8rY9VCkpzRLP3rlpnVHtwYew4.km",
+      "aes_key": "a68CqbWmmf0cuvgvMhm9OC+Y24ut3DY/0WBqtd3nGfU=",
+      "files": []
+    }
+  ]
+}
\ No newline at end of file