Test

skhinach
1 parent 0f1eb4c5
Showing 20 changed files with 25 additions and 12 deletions Show diff stats
Network/Makefile
Sioux/Tableau.css
Sioux/http.c
Tangible/#socket.h#
Tangible/ethernet.h
Tangible/socket.c
Tangible/socket.h
Tangible/socket.o
Tangible/spi.h
Tangible/tangibleInterface.hex
Tangible/tangibleInterface.o
Tangible/w5100.c
Tangible/w5100.h
Threads/threadSocket.c
bin/serverTCP
bin/sonde
includes/http.h
libs/libnet.a
libs/libthrd.a
src/serverTCP.c
@@ -16,7 +16,7 @@ LDFLAGS=-lpthread -lpcap
 all: $(LIB)
  
 $(LIB): sender.o sniffer.o tcpserver.o
-	rm -f $@
+	rm -f $(LDIR)$@
 	$(CLIBS) $(LDIR)$@ $^
 	ranlib $(LDIR)$@
 	rm -f *.o	
@@ -53,7 +53,12 @@ li
  
 .etat
     {
-        flex-basis: 60%;
+        flex-basis: 30%;
+}
+
+.commande
+{
+	flex-basis: 30%;
 }
  
 .no_inter
 #include "http.h"
-
+#include <stdlib.h>
  
 void freePage(struct PageWeb** page)
 {
@@ -76,7 +76,7 @@ void createPage(struct PageWeb** page, struct interface_info* interfaces[20])
 	}
  
 	strcat((*page)->html_contents,"</head><body><div class=\"container\"><h2>Interfaces Tangibles</h2><ul class=\"tableau\">");
-	strcat((*page)->html_contents,"<li class=\"table-entete\"><div class=\"col nom\">Interfaces</div><div class=\"col etat\">Etat</div></li>");	
+	strcat((*page)->html_contents,"<li class=\"table-entete\"><div class=\"col nom\">Interfaces</div><div class=\"col etat\">Etat</div><div class=\"col commande\">Commande</div></li>");	
  
 	int nbr_interfaces=0;
  
@@ -101,9 +101,22 @@ void createPage(struct PageWeb** page, struct interface_info* interfaces[20])
 					case(1):
 						strcat((*page)->html_contents,"</div>\n<div class=\"col etat\" style=\"color: green\" data-label=\"Etat\">Mode Eveillé</div>\n");
 						break;	
+				}	
+				if(interfaces[i]->commande>=0)
+				{
+					char tmp[10];
+					sprintf(tmp, "%d", interfaces[i]->commande);
+					strcat((*page)->html_contents,"<div class=\"col commande\" data-label=\"Etat\">");
+					strcat((*page)->html_contents,tmp);
+					strcat((*page)->html_contents,"%</div>\n");
+				}
+				else
+				{
+					strcat((*page)->html_contents,"<div class=\"col commande\" style=\"color: grey\" data-label=\"Etat\">Inconnu</div>\n");
 				}
 				strcat((*page)->html_contents,"</li>");
 			}
+
 		}
 	}
  
@@ -118,29 +118,24 @@ int interfaceReponse(FILE* sockdial_stream, char packet[BUFF_SIZE], Arg_Thread* 
 		return -1;
 	}
  
-	
 	strcpy(buffer, "\x60\x00"); // Demande la commande en mémoire
  
 	fprintf(sockdial_stream, "%s", buffer); // Transmission du message 
  
-	
 	fgets(packet, BUFF_SIZE, sockdial_stream); // Attente de reception du message
-
-
  
 	if( strlen(packet)>=2 && (packet[0]&0xE0)==0x10 )
-		argument->interfaces[i]->commande = (packet[0]&0x01)*256+packet[1];
+		argument->interfaces[i]->commande = (packet[0]&0x1F)*256+packet[1];
 	else
 	{
 		argument->interfaces[i]->commande = -1;
-		return -1; // Si le message n'est pas reçu correctement
+		//return -1; // Si le message n'est pas reçu correctement
 	}
  
 	strcpy(buffer, "\xE0\x00"); // Signale la fin de l'interrogation
  
-	fprintf(sockdial_stream, "%s", buffer); // Transmission du message 
+	fprintf(sockdial_stream, "%s", buffer); // Transmission du message
  
-	
 	pthread_mutex_unlock(&(argument->requete_mutex)); // Libération de la section critique
  
 	return 0;