From 110598780b96829a9ee26de26cbca4dd66395b3e Mon Sep 17 00:00:00 2001
From: xdrm-brackets <doowap31@gmail.com>
Date: Tue, 16 May 2017 21:02:52 +0200
Subject: [PATCH 1/7] Makefile update (input cleaned) + global makefile

---
 Makefile       | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 plane/Makefile |  4 ++--
 sgca/Makefile  |  8 ++++----
 3 files changed, 53 insertions(+), 6 deletions(-)
 create mode 100644 Makefile

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..7eeb330
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,47 @@
+
+default:
+	@echo "install - will compile and create executables";
+	@echo "clean   - will remove executables and clean";
+
+
+
+install-sgca:
+	@echo "(1) Compiling SGCA";
+	@make --directory=./sgca > /dev/null;
+
+install-plane:
+	@echo "(2) Compiling PLANE";
+	@make --directory=./plane > /dev/null;
+
+link-sgca:
+	@echo "(3) Linking SGCA executable";
+	@ln -fs ./sgca/boot x-sgca;
+
+link-plane:
+	@echo "(4) Linking PLANE executable";
+	@ln -fs ./plane/boot x-plane;
+
+link-viewTerm:
+	@echo "(4) Linking VIEW TERMINAL executable";
+	@echo -e "#!/bin/bash\n\njava -jar ./viewTerm/viewTerm.jar;\n" > ./x-viewTerm;
+	@chmod ug+x ./x-viewTerm;
+
+link-ctrlTerm:
+	@echo "(5) Linking CTRL TERMINAL executable";
+	@echo -e "#!/bin/bash\n\njava -jar ./ctrlTerm/commandTerm.jar;\n" > ./x-ctrlTerm;
+	@chmod ug+x ./x-ctrlTerm;
+
+
+install: install-sgca install-plane link-sgca link-plane link-viewTerm link-ctrlTerm
+	@echo;
+	@echo "*** Executables created:";
+	@ls -a . | grep -P "^x-*" | sed 's/^x-/  (*) x-/';
+
+
+clean:
+	@find ./x-sgca     > /dev/null 2>&1 && rm ./x-sgca     || return 0;
+	@find ./x-plane    > /dev/null 2>&1 && rm ./x-plane    || return 0;
+	@find ./x-viewTerm > /dev/null 2>&1 && rm ./x-viewTerm || return 0;
+	@find ./x-ctrlTerm > /dev/null 2>&1 && rm ./x-ctrlTerm || return 0;
+	@make clean --directory=./sgca  > /dev/null;
+	@make clean --directory=./plane > /dev/null;
\ No newline at end of file
diff --git a/plane/Makefile b/plane/Makefile
index de56c35..566baf4 100644
--- a/plane/Makefile
+++ b/plane/Makefile
@@ -23,5 +23,5 @@ all: clean boot
 
 # cleans the compiled files
 clean:
-	find ./lib/network/**/*.o && rm ./lib/network/**/*.o || return 0;
-	find boot && rm boot || return 0;
+	@find ./lib/network/**/*.o >/dev/null 2>&1 && rm ./lib/network/**/*.o || return 0;
+	@find ./boot               >/dev/null 2>&1 && rm ./boot               || return 0;
diff --git a/sgca/Makefile b/sgca/Makefile
index 544119e..284be0c 100644
--- a/sgca/Makefile
+++ b/sgca/Makefile
@@ -35,7 +35,7 @@ all: clean boot
 
 # cleans the compiled files
 clean:
-	find lib/network/*.o && rm lib/network/*.o || return 0;
-	find lib/network/**/*.o && rm lib/network/**/*.o || return 0;
-	find lib/local/*.o && rm lib/local/*.o || return 0;
-	find boot && rm boot || return 0;
+	@find lib/network/*.o    >/dev/null 2>&1 && rm lib/network/*.o    || return 0;
+	@find lib/network/**/*.o >/dev/null 2>&1 && rm lib/network/**/*.o || return 0;
+	@find lib/local/*.o      >/dev/null 2>&1 && rm lib/local/*.o      || return 0;
+	@find boot               >/dev/null 2>&1 && rm boot               || return 0;

From 821808a42089485a7e87c2f16597ca0f0e439312 Mon Sep 17 00:00:00 2001
From: SeekDaSky <mascaro.lucas@yahoo.fr>
Date: Thu, 18 May 2017 20:24:39 +0200
Subject: [PATCH 2/7] fix compilation

---
 plane/Makefile | 2 +-
 sgca/Makefile  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plane/Makefile b/plane/Makefile
index 566baf4..2698714 100644
--- a/plane/Makefile
+++ b/plane/Makefile
@@ -19,7 +19,7 @@ boot: lib/network/tcp/client.o lib/network/udp/server.o plane.h plane.c
 
 
 # Run full compilation
-all: clean boot
+all: boot
 
 # cleans the compiled files
 clean:
diff --git a/sgca/Makefile b/sgca/Makefile
index 284be0c..384e1e9 100644
--- a/sgca/Makefile
+++ b/sgca/Makefile
@@ -31,7 +31,7 @@ boot: lib/network/common.o lib/network/tcp/server.o lib/network/udp/server.o lib
 
 
 # Run full compilation
-all: clean boot
+all: boot
 
 # cleans the compiled files
 clean:

From c8da1b3ba619053d946f306b0377d5ab7dad4afb Mon Sep 17 00:00:00 2001
From: SeekDaSky <mascaro.lucas@yahoo.fr>
Date: Thu, 18 May 2017 20:43:32 +0200
Subject: [PATCH 3/7] ControlTerm - final

---
 ctrlTerm/commandTerm.jar                      | Bin 12752 -> 13121 bytes
 .../src/ControlTerminal/ControlTerminal.java  |   8 ++++++--
 ctrlTerm/src/ControlTerminal/Plane.java       |   2 +-
 .../src/ControlTerminal/PlaneContainer.java   |  18 ++++++++++++++++++
 viewTerm/src/ViewTerminal/Plane.java          |   2 +-
 viewTerm/viewTerm.jar                         | Bin 10210 -> 10210 bytes
 6 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/ctrlTerm/commandTerm.jar b/ctrlTerm/commandTerm.jar
index 562e7b46dc97fd847bd2fca800bd2b94b2a765c1..a4f6a3df90232c789a3c1524731fd04ec533e7e0 100644
GIT binary patch
delta 7086
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

delta 6792
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

diff --git a/ctrlTerm/src/ControlTerminal/ControlTerminal.java b/ctrlTerm/src/ControlTerminal/ControlTerminal.java
index fea2a93..a9999ab 100644
--- a/ctrlTerm/src/ControlTerminal/ControlTerminal.java
+++ b/ctrlTerm/src/ControlTerminal/ControlTerminal.java
@@ -167,7 +167,11 @@ public class ControlTerminal {
                 				plane.setSpeed(data);
                 				flags = (byte) (flags|0x04);
                 				break;
-                			}
+        					default:
+        						System.out.println("Wrong input please retry");
+            					s.nextLine();
+        						break;
+        					}
         				}catch(Exception e){
         					System.out.println("Wrong input please retry");
         					s.nextLine();
@@ -180,7 +184,7 @@ public class ControlTerminal {
             				break;
             			}
         			}
-        			System.out.println("flags: "+flags);
+        			container.setExpectedFlags(flags);
         			buf = ByteBuffer.allocate(27);
         			buf.put(flags);
         			buf.put(plane.toBytes());
diff --git a/ctrlTerm/src/ControlTerminal/Plane.java b/ctrlTerm/src/ControlTerminal/Plane.java
index a437024..adb19cb 100644
--- a/ctrlTerm/src/ControlTerminal/Plane.java
+++ b/ctrlTerm/src/ControlTerminal/Plane.java
@@ -98,7 +98,7 @@ public class Plane{
 		case 4:
 			if(this.isDead){
 				return "\033[4;37;41m ATTENTION: avion hors ligne\t|\033[0m";
-			}else if(this.speed<50){
+			}else if(this.speed<300){
 				return "\033[5;37;41m --Speed: "+this.speed+"\t\t\t|\033[0m";
 			}else{
 				return "\033[0m --Speed: "+this.speed+"\t\t\t|";
diff --git a/ctrlTerm/src/ControlTerminal/PlaneContainer.java b/ctrlTerm/src/ControlTerminal/PlaneContainer.java
index fdbb4b4..ba82d67 100644
--- a/ctrlTerm/src/ControlTerminal/PlaneContainer.java
+++ b/ctrlTerm/src/ControlTerminal/PlaneContainer.java
@@ -12,6 +12,7 @@ public class PlaneContainer {
 	private HashMap<String,Plane> map;
 	private AsynchronousDatagramSocket socket;
 	private Printer printer;
+	private byte expectedFlags = 0x01;
 	
 	public PlaneContainer(){
 		this.map = new HashMap<String,Plane>();
@@ -25,6 +26,10 @@ public class PlaneContainer {
 		this.printer = p;
 	}
 	
+	public void setExpectedFlags(byte flags){
+		this.expectedFlags = flags;
+	}
+	
 	public void notifyReceive() throws InvalidFlagException{
 		DatagramPacket packet = this.socket.synchronousReceive();
 		
@@ -41,6 +46,19 @@ public class PlaneContainer {
 		
 		//System.out.println("Processing "+nbrPlane+" planes");
 		
+		if(this.expectedFlags != flag){
+			System.out.println("\033[5;37;41m Plane could not apply data \033[0m");
+			if((flag&(byte)0x10) == 1){
+				System.out.println("\033[5;37;41m Plane crashed gracefully \033[0m");
+			}
+			try {
+				Thread.sleep(2000);
+			} catch (InterruptedException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+		
 		if(flag == 0){
 			//this is a ping response
 			return;
diff --git a/viewTerm/src/ViewTerminal/Plane.java b/viewTerm/src/ViewTerminal/Plane.java
index 0e11ede..00579a6 100644
--- a/viewTerm/src/ViewTerminal/Plane.java
+++ b/viewTerm/src/ViewTerminal/Plane.java
@@ -95,7 +95,7 @@ public class Plane {
 		case 4:
 			if(this.isDead){
 				return "\033[4;37;41m ATTENTION: avion hors ligne\t|\033[0m";
-			}else if(this.speed<50){
+			}else if(this.speed<300){
 				return "\033[5;37;41m --Speed: "+this.speed+"\t\t\t|\033[0m";
 			}else{
 				return "\033[0m --Speed: "+this.speed+"\t\t\t|";
diff --git a/viewTerm/viewTerm.jar b/viewTerm/viewTerm.jar
index 5dafac4bbe05a96a20f145b11687d99b7a57167c..0c8f5a6c46ebdec9cec5078cde7c3af2ceb5d685 100644
GIT binary patch
delta 1318
zcmV+>1=;%IPvTDuP)h>@6aWYa2mq&Tkqoo~lWnoW)&l~QZL^vLBnASLZIi$XDFTyi
zv+D{61p<?8v-A(X1_G09le88yf0u+L8y1jAcre5St29Kyg926%TS3%V1S=^PvFeg+
zVQok<Nw81!JG3wRw(sin1<V+nX=nTZ{Q~_M?F{cbJ?GvHq|0WSncaKt!#U^oKlk3v
zAOHOJ4!|U~{Advfty$(*8MC}&6^#7Y!@N;2{qPE$d1<^d#;ChBwzB!sf6P_|yxC&T
zB#)(&snu%PDs0UPh_C5M)AJ2I-wJrLMoFNxQZmh)fX}MjHVrbw6YAWs3Rd-|z`4Zf
zNNN5JuTioEN*06%XLWR<n<6HL*E9(9=xBwHtv(%o1lT&KLsQm(j-ay6>u6I}T!*f#
z3p(1-A<(&G70l(`olUcxe=#=mQdBW(<kyU{#eI9wTiv!Q0^LieYebU$TV{1ZR-`*I
z>{b(hrM@8SqEw2c5T8kDR61`(cD#vneQI3|uB+Y?)#D0sX09(ea<^i412n#>DjujD
zo1UCyDq2>}FliUu0B%sFQvdVwgZ8c0={&z{<#T2^fR6;aA{&#le^;-~PEPE^S^P{q
zh&jyjCMMastz!{)2-+x>%mU%1+-h@b$WB3+_oxh-rtNXC`#L^Gg49-vYFPje8W673
z5dv7D6CK$Y-ywwy#bP;EnTdbL5k6s@M|5u7igJ=PLr0ey-k0y=+Fk&(QF=X|QQ{1=
z5hD%SZ)Gxz%bE1bfAUP+cx4p}@$F){63<&(1ykE&&j6m%$%$-C)jd)vxnUgZ8A)P|
zYTXNg4m;QJicJAJ&%zRDU#%M1FCQ2s`_Kkgi@W8ldB>6+d00nT7zW9~LpPtUJ>MX*
zTKN9RR<qln-L~1SZnt!6s69gwI_0~IdI!=UxSV{8Q1WsOf8pdn4ZX=|4gJZmw}wbE
z+*(648TQo>OL}S;JdnZOqxTS{1O@d{K#f9nP{^|gp`YF{bmJ1jNTLT9Y1KWIhQ@{f
zX)(T#77J*R7EAC*i$!>)#WGr@#X{KUeI#uBF|HrAt;shC?;nGy!2L3@t`^vd1%?Sp
zIp3t!oYp6Gf1k(-%F!tKoR<-L)T(22pN%dEX~YGj_g4qVpeslUqo+V3RC_1LCGr_+
z0>YK!#AB`?{Z5c!SCDackbWmfihM?!fM_<zgeyqI2{Pdda>X4a;slu@pXnwbK^x?%
zD@fD{a@`fAo&H%*I}bXY=Uknq+*L%KDsGX_d=nLIf3}KgR~0cQ$f7IAHFuDh6C_PO
z_nUy|HpmBbomH$!S|emE?|(i9D%LW^T4|v19n)OLjEW$(>5B8(qsVKS<u9loUw8Fc
z0iM(I13kZlX7{=DKVjf^%&mt$e2ZIr*AKA}x=XJ^r1#~-QnQI=HPL&BhoM!P;Cs<v
zN7(+ff6?Kwa)|OoJ(5E3h1S`Mb%~LmZJrIaIL3=VZ;bN1VWJ)-Wbh}-BSlWrAp;&!
zsWS9ETcfRdjJsIJ3p~Y-c!t+x9l*dFY~mfV_!B1n#&*Lt9UX7e5zX^9<;ZS>cCjVa
zH{PdR=%XQ1?#~zh0#Hi_2uz|J$Z-S!05A#w4FFI}0|XQR2nYxOlWntW8|4QAlWnt7
zBbNaJr)`t#B!L2xZIf;#Qv#E1lfxxj0+Vf%ASO8ilWmh*CPo62ZIh!WOAV84q)JSp
c9LRA5001zP`zAR8lWmhWCrtvAZIgv3U0%*>R{#J2

delta 1318
zcmV+>1=;%IPvTDuP)h>@6aWYa2mrBTkqoo~rDCzd)&l~iVzZhABnASdVw1oMDFUTp
zv+D{61p=jFv-A(X1_GsGle88ye@jA=4U1qTJQ!j^t2C^JCjl#nEg)(vf|V4DSanIZ
zVQok<Nw81!JG3u-+jn*P0%i=(w9|foet>?Ac7_ko={fgqLb`0Gnc2PPKAdxY|8wu%
z{PE8(zXO;;&W|<)p$*IYGHsT3t%8vsdyqE@rXOAf-7k!n#u#;TV{6+lf6Po(fj3jk
zn&h!^GPPbUTZP=50_7`uQuKUH&o>G@8Kb12y;3sGtOB1^xn&w;D37Ug!zx(Sn+nb+
zPDe`dZ)Ag#Em5){JUFMJ3q2GuF|wgTL9d2(_}J>#;75S1^BPoX4QdEV>w<<3X~i{Y
z(t1ZjC(bD7TCob|>fY|Qe_2i&+j$|Xm@)DjM%m)NJ?O3OSQQ05E2nEjlKnZex+E&n
zlNfQUiN8``5Oz^2L{f-Pg)}Oiw<0>;M5;cuDF-)Y@3HK01vxX<mmIlUvAY2pUzZgR
zR2rryYnhUkRWnS=1vh{jRH@|u{QRJO>vK9U?pgV)Sq|Vs1!p5$e^YZ;ugy(O?8aIA
zY&?j0Eb=DmY~9kZjN1flluBlS@RDw|IW=UbAk4c|231w}IoLf7A0a_%t3|mifcs4d
zlXZju*62h>w#Ii!;Zm_!&Q@mQ-*SYH8RsFL8@HmIBu&%NrH1$AySTa^0Bw|3k7txP
z18u~WChZI9^zv#tf3>zc8#i8B#X@|iSgyqLR<2;G`|KIO6FNDOt?9Z)GATBUV?8BF
ztWmCeuHcNFtFdBR0i9>XQqZ|xH8Nk^H%j)Q4XzjW${F*vB|74;j<PTek%NbBK3#jh
zL1eY@{SmEdw?Vt@uv^V;>DEx&O%b}p`z-Yig+Fjve~XZQf4PRRK3GGa9<5<O4|{8f
z=;8JnqI%d@LrnM7Fmxz_y-V+5N(l<;rGP4hJVPPRA%p>X$IydI2t!9NF4C&IG7XIl
z1Hxi_MOZALO;{|!BP<r-6&A~A7ZwX)pZAck@yED+)VAwy5I$&t$-o05u_hPTi4}|x
zl61aFt2wPtf9O7u6%?aU^0^=)^vYEYbf1l`5YiPFkiMTCAVaPoNsOKXiBRpGAeYEz
zxCIDTjuVf$f($r8MqEM0-9ZMNAW8BWZ2_X%AQP@25huumE6AifNW=*;O+GU%K!P^N
zRacOx6Xd!pNGJWXo^~E`I?ua0PrIv#I#n!?&teM|e;u}p8CMlCC&;oZ$TfG6m=h#L
zKKELHXg0|Ebe(0aDO#h5Sl<793}mcTinZ26<7?1d$E=K?<mig?+T+M;k>xMQA76L*
zSplBW^F2L3h2{>p^sg}ZE9N&tAH2l^-}NIbh3?Sn2&n@xvC?W{RZjFB;X!DfCiq@7
z*%7use`$7jBpsqWQI8}Me4$OYV%?KJ+BjQsZH(7`)*R$n(?mT;$lx!OM`)a(GX^}Q
zN~P&@wn01f2zRiF=Xio2@D#7fI)s5Y*v4<j;7^$N8#_(AblljbW18n(%97my^<rDB
zf4pBE>Zc)7Y|rQa0#Hi_2;&#FNpS=K051vv4FFI}0|XQR2nYxOGh?%B8|4QArDC&E
zBbNaJv160#B!L2@Vv}wqQv#)8lfxxj0;OV;ASO8irDBs?CPo6KVw0mLOAV!Bq)Ou#
cwn=dW001wO`zAR8Gh>rBCrtvSVv~g@U3{8WKmY&$


From 4636c79334bafa8b7a06e8a5e411c38ebe84d95c Mon Sep 17 00:00:00 2001
From: xdrm-brackets <doowap31@gmail.com>
Date: Fri, 19 May 2017 08:49:05 +0200
Subject: [PATCH 4/7] fixed socket reference conflicts in vTerm+cTerm as in
 plane

---
 sgca/lib/local/handler.c | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/sgca/lib/local/handler.c b/sgca/lib/local/handler.c
index 0d06a80..865fd5a 100644
--- a/sgca/lib/local/handler.c
+++ b/sgca/lib/local/handler.c
@@ -215,9 +215,11 @@ void* manageViewTerm(void* THREADABLE_ARGS){
 	int                sent;                 // compteurs d'envoi
 	int                i, index = -1;        // Compteurs globaux
 	char*              buffer   = malloc(1); // Buffer d'envoi
+	int                SOCKET;
 
 	/* 2. On récupère les arguments */
 	struct handler_arg* arg = THREADABLE_ARGS;
+	memcpy(&SOCKET, &arg->socket, sizeof(int));
 
 	/* 3. On récupère le rang dans les "managers" */
 	for( i = 0 ; i < MAX_UDP_THR ; i++ )
@@ -228,7 +230,7 @@ void* manageViewTerm(void* THREADABLE_ARGS){
 
 	/* 4. Attente d'un client */
 	len = sizeof(struct sockaddr_in);
-	if( recvfrom(arg->socket, buffer, MAX_BUF_LEN*sizeof(char), 0, (struct sockaddr*) &clientInfo, &len) < 0 ){
+	if( recvfrom(SOCKET, buffer, MAX_BUF_LEN*sizeof(char), 0, (struct sockaddr*) &clientInfo, &len) < 0 ){
 		printf("{udp_vterm}{com}(%d)      No terminal detected, exiting\n", index);
 		loop = 0;
 	}
@@ -248,7 +250,7 @@ void* manageViewTerm(void* THREADABLE_ARGS){
 		=========================================================*/
 		/* 2. Envoi */
 		len = sizeof(struct sockaddr_in);
-		sent = sendto(arg->socket, buffer, buflen + 1, 0, (struct sockaddr*) &clientInfo, len);
+		sent = sendto(SOCKET, buffer, buflen + 1, 0, (struct sockaddr*) &clientInfo, len);
 
 		/* 3. Gestion erreur */
 		if( sent <= 0 ){
@@ -261,7 +263,7 @@ void* manageViewTerm(void* THREADABLE_ARGS){
 		=========================================================*/
 		/* 1. Réception feedback (0x10) */
 		len = sizeof(struct sockaddr_in);
-		sent = recvfrom(arg->socket, buffer, 1, 0, (struct sockaddr*) &clientInfo, &len);
+		sent = recvfrom(SOCKET, buffer, 1, 0, (struct sockaddr*) &clientInfo, &len);
 
 		/* 2. Gestion erreur (erreur ou mauvais feedback != 0x10) */
 		if( sent <= 0 || buffer[0] != TERMREQ_OFF ){
@@ -284,7 +286,7 @@ void* manageViewTerm(void* THREADABLE_ARGS){
 		arg->activeUDPManagers[index] = 0;
 
 	/* 2. On ferme la socket + libère la mémoire */
-	close(arg->socket);
+	close(SOCKET);
 	free(buffer);
 
 
@@ -331,10 +333,13 @@ void* manageCtrlTerm(void* THREADABLE_ARGS){
 	char*              dataBuffer = malloc(1);
 	struct term_req    request;                       // Requête
 	char               flags;
+	int                SOCKET;
+	struct in_addr*    ip = malloc(sizeof(struct in_addr));
 
 
 	/* 2. On récupère les arguments */
 	struct handler_arg* arg = THREADABLE_ARGS;
+	memcpy(&SOCKET, &arg->socket, sizeof(int));
 
 	/* 3. On récupère le rang dans les "managers" */
 	for( i = 0 ; i < MAX_UDP_THR ; i++ )
@@ -344,11 +349,16 @@ void* manageCtrlTerm(void* THREADABLE_ARGS){
 
 	/* 4. Attente d'un client */
 	len = sizeof(struct sockaddr_in);
-	if( recvfrom(arg->socket, buffer, MAX_BUF_LEN*sizeof(char), 0, (struct sockaddr*) &clientInfo, &len) < 0 ){
+	if( recvfrom(SOCKET, buffer, MAX_BUF_LEN*sizeof(char), 0, (struct sockaddr*) &clientInfo, &len) < 0 ){
 		printf("{udp_cterm}{com}(%d)      No terminal detected, exiting\n", index);
 		loop = 0;
-	}else
-		printf("{udp_cterm}{com}(%d)      Terminal connected\n", index);
+	}else{
+		ip->s_addr = clientInfo.sin_addr.s_addr;
+		printf("{udp_cterm}{com}(%d)      Terminal connected from %s:%d\n", index, inet_ntoa(*ip), ntohs(clientInfo.sin_port));
+	}
+
+	free(ip);
+
 
 
 	while( loop ){
@@ -360,14 +370,14 @@ void* manageCtrlTerm(void* THREADABLE_ARGS){
 		/* 1. On lit sur la socket */
 		len = sizeof(struct sockaddr_in);
 		bzero(buffer, sizeof(char)*MAX_BUF_LEN);
-		count = recvfrom(arg->socket, buffer, MAX_BUF_LEN, 0, (struct sockaddr*) &clientInfo, &len);
+		count = recvfrom(SOCKET, buffer, MAX_BUF_LEN, 0, (struct sockaddr*) &clientInfo, &len);
 
 		/* 2. Si erreur reception */
 		if( count <= 0 ) // because of timeout or error
 			break;
 
 		if( count < TERMREQ_LEN ){
-			send(arg->socket, "\0\0", sizeof(char)*2, 0);
+			send(SOCKET, "\0\0", sizeof(char)*2, 0);
 			if( DEBUGMOD&BUF ) printf("{udp_cterm}{com}(%d)      Error receiving request\n", index);
 			continue;
 		}
@@ -390,7 +400,7 @@ void* manageCtrlTerm(void* THREADABLE_ARGS){
 		update = ( request.flags&TERMREQ_ALT || request.flags&TERMREQ_CAP || request.flags&TERMREQ_SPD );
 		fbk    = request.flags&TERMREQ_FBK;
 		if( !( update || fbk ) ){
-			send(arg->socket, "\x00\0", sizeof(char)*2, 0);
+			send(SOCKET, "\x00\0", sizeof(char)*2, 0);
 			if( request.flags != 0 )
 				printf("{udp_cterm}{com}(%d)      Invalid flags\n", index);
 			continue;
@@ -500,7 +510,7 @@ void* manageCtrlTerm(void* THREADABLE_ARGS){
 		=========================================================*/
 		printf("{udp_cterm}{com}(%d)      Sending response { flags: %d; n: %d }\n", index, dataBuffer[0], dataBuffer[1]);
 		len = sizeof(struct sockaddr_in);
-		if( sendto(arg->socket, dataBuffer, dataLen, 0, (struct sockaddr*) &clientInfo, len) < 0 )
+		if( sendto(SOCKET, dataBuffer, dataLen, 0, (struct sockaddr*) &clientInfo, len) < 0 )
 			printf("{udp_cterm}{com}(%d)      Cannot answer to terminal\n", index);
 
 
@@ -514,7 +524,7 @@ void* manageCtrlTerm(void* THREADABLE_ARGS){
 		arg->activeUDPManagers[index] = 0;
 
 	/* 2. On ferme la socket */
-	close(arg->socket);
+	close(SOCKET);
 	free(dataBuffer);
 
 	/* 3. On arrête le THREAD */

From 87509e8efed408a9efe15c09ecc920a3ce6fb527 Mon Sep 17 00:00:00 2001
From: xdrm-brackets <doowap31@gmail.com>
Date: Fri, 19 May 2017 08:50:44 +0200
Subject: [PATCH 5/7] Fixed Makefile-s

---
 plane/Makefile | 4 ++--
 sgca/Makefile  | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/plane/Makefile b/plane/Makefile
index 2698714..6df6eb2 100644
--- a/plane/Makefile
+++ b/plane/Makefile
@@ -23,5 +23,5 @@ all: boot
 
 # cleans the compiled files
 clean:
-	@find ./lib/network/**/*.o >/dev/null 2>&1 && rm ./lib/network/**/*.o || return 0;
-	@find ./boot               >/dev/null 2>&1 && rm ./boot               || return 0;
+	@rm ./lib/network/**/*.o;
+	@rm ./boot;
diff --git a/sgca/Makefile b/sgca/Makefile
index 384e1e9..173faad 100644
--- a/sgca/Makefile
+++ b/sgca/Makefile
@@ -35,7 +35,7 @@ all: boot
 
 # cleans the compiled files
 clean:
-	@find lib/network/*.o    >/dev/null 2>&1 && rm lib/network/*.o    || return 0;
-	@find lib/network/**/*.o >/dev/null 2>&1 && rm lib/network/**/*.o || return 0;
-	@find lib/local/*.o      >/dev/null 2>&1 && rm lib/local/*.o      || return 0;
-	@find boot               >/dev/null 2>&1 && rm boot               || return 0;
+	@rm lib/network/*.o;
+	@rm lib/network/**/*.o;
+	@rm lib/local/*.o;
+	@rm boot;

From 710a5def490866683d8e9d88e067c2590491ab30 Mon Sep 17 00:00:00 2001
From: SeekDaSky <mascaro.lucas@yahoo.fr>
Date: Fri, 19 May 2017 09:35:50 +0200
Subject: [PATCH 6/7] fix

---
 ctrlTerm/commandTerm.jar                      | Bin 13121 -> 13254 bytes
 .../src/ControlTerminal/PlaneContainer.java   |  12 +++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ctrlTerm/commandTerm.jar b/ctrlTerm/commandTerm.jar
index a4f6a3df90232c789a3c1524731fd04ec533e7e0..6e3fd5632343522086c12ea9830f24b1a903e6a0 100644
GIT binary patch
delta 2493
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

delta 2390
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

diff --git a/ctrlTerm/src/ControlTerminal/PlaneContainer.java b/ctrlTerm/src/ControlTerminal/PlaneContainer.java
index ba82d67..60bb4a3 100644
--- a/ctrlTerm/src/ControlTerminal/PlaneContainer.java
+++ b/ctrlTerm/src/ControlTerminal/PlaneContainer.java
@@ -47,11 +47,21 @@ public class PlaneContainer {
 		//System.out.println("Processing "+nbrPlane+" planes");
 		
 		if(this.expectedFlags != flag){
-			System.out.println("\033[5;37;41m Plane could not apply data \033[0m");
+			if((this.expectedFlags&(byte)0x02) == 2 && (flag&(byte)0x02) != 2){
+				System.out.println("\033[5;37;41m Could not apply cap \033[0m");
+			}
+			if((this.expectedFlags&(byte)0x04) == 4 && (flag&(byte)0x04) != 4){
+				System.out.println("\033[5;37;41m Could not apply speed \033[0m");
+			}
+			if((this.expectedFlags&(byte)0x08) == 8 && (flag&(byte)0x08) != 8){
+				System.out.println("\033[5;37;41m Could not apply alt \033[0m");
+			}
+			System.out.println("\033[5;37;41m One or more fields could not be updated \033[0m");
 			if((flag&(byte)0x10) == 1){
 				System.out.println("\033[5;37;41m Plane crashed gracefully \033[0m");
 			}
 			try {
+				this.expectedFlags = 0x01;
 				Thread.sleep(2000);
 			} catch (InterruptedException e) {
 				// TODO Auto-generated catch block

From 2d176987ea2f51048a8ad96c8979c84167a00a16 Mon Sep 17 00:00:00 2001
From: xdrm-brackets <doowap31@gmail.com>
Date: Fri, 19 May 2017 09:45:15 +0200
Subject: [PATCH 7/7] last fix std99

---
 plane/plane.c          | 3 ++-
 sgca/central-manager.c | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/plane/plane.c b/plane/plane.c
index 586efad..159d624 100644
--- a/plane/plane.c
+++ b/plane/plane.c
@@ -378,4 +378,5 @@ int main(){
   // on se déplace une fois toutes les initialisations faites
   printf("\n=== COMMUNICATION PROTOCOL ===\n");
   update();
-}
\ No newline at end of file
+  return EXIT_SUCCESS;
+}
diff --git a/sgca/central-manager.c b/sgca/central-manager.c
index 36a5951..ea7d595 100644
--- a/sgca/central-manager.c
+++ b/sgca/central-manager.c
@@ -76,7 +76,8 @@ int main(int argc, char* argv[]){
 
 	/* [2] On attends la fin de tous les THREADS
 	==========================================================*/
-	for( char i = 0 ; i < 4 ; i++ )
+  char i;
+	for( i = 0 ; i < 4 ; i++ )
 		pthread_join(listenManagers[(int)i], NULL);
 
 
@@ -452,4 +453,4 @@ void* MCAST_PUBLISH(void* THREADABLE_ARGS){
 	close(SOCKET);
 
 	return NULL;
-}
\ No newline at end of file
+}