diff --git a/header/bal.h b/header/bal.h index 23bacce..faadbe4 100644 --- a/header/bal.h +++ b/header/bal.h @@ -25,5 +25,6 @@ struct elementMessage * initElementMessage(void); struct listeMessage initListeMessage(void); void ajoutListe(struct listeMessage * listeActuel,messageBAL * leMessage); void afficheListeMessage(struct listeMessage listeActuel); +int bal(void); #endif \ No newline at end of file diff --git a/header/tsock.h b/header/tsock.h index e67c1a2..8e51d59 100644 --- a/header/tsock.h +++ b/header/tsock.h @@ -20,4 +20,10 @@ void getNonOtpArgs(char ** argv, int argc, int * portNumber, char * ipAddress[]) void formatText(char * actualMessage, int num, int tailleMessage, char messageChar); int exitMax(int var,int tailleMax); +char * formatTextParam(int numEmetteur, int numRecepteur, int tailleMessage, int nbMessage); +char * formatTextMessage(char * message, int tailleMessage); +int convertion(int nbr,char *numbuffer); +int gestionOffset(char *actualMessage,int encadrementHaut,int encadrementBas,int nbr); +int testProtocol(void); + #endif \ No newline at end of file diff --git a/src/bal.c b/src/bal.c index 7b8b94e..968e00d 100644 --- a/src/bal.c +++ b/src/bal.c @@ -1,6 +1,6 @@ #include "../header/bal.h" -int main(void){ +int bal(void){ struct listeMessage l = initListeMessage(); messageBAL * messageBAL = creeMessage("Renvoi moi mon pdf asap. -Simon",1); ajoutListe(&l,messageBAL); diff --git a/src/listebal.c b/src/listebal.c deleted file mode 100644 index 03fe3da..0000000 --- a/src/listebal.c +++ /dev/null @@ -1,46 +0,0 @@ -#include -#include -#include -#include - -struct message{ - char *data; - int tailleData; - int idEmeteur; - struct message *messageSuiv; - struct message *messageFin; -}; - -typedef struct { - - int idRecept; - struct BAL *BALSuiv; - struct BAL *BALFin; - struct message *message; -}BAL; - - -struct message creeMessage(char *dataPara,int idEmeteurPara); - -int main(void){ - char * txt="simon"; - struct message *listeMessage =malloc(sizeof(struct message)); - *listeMessage=creeMessage(txt,12); - printf("idEmeteur = %d\n",listeMessage->idEmeteur); - printf("data=%s\n",listeMessage->data); - printf("taille data=%d\n",listeMessage->tailleData); - return 0; -} - - - -struct message creeMessage(char *dataPara,int idEmeteurPara){ - int tailleDataPara =strlen(dataPara); - struct message * elementMessage =(struct message *)malloc(sizeof(struct message)); - - elementMessage->idEmeteur=idEmeteurPara; - elementMessage->tailleData=tailleDataPara; - elementMessage->data=(char*)malloc(sizeof(char)*tailleDataPara); - strcpy(elementMessage->data,(dataPara)); - return *elementMessage; -} \ No newline at end of file diff --git a/src/main.c b/src/main.c index 34d8175..1523e2c 100644 --- a/src/main.c +++ b/src/main.c @@ -4,6 +4,7 @@ int main (int argc, char **argv) { + testProtocol(); char usageChar[30]="usage: cmd [-p|-s][-n ##]\n"; char *ipAddress; extern char *optarg; diff --git a/src/tsock.c b/src/tsock.c index 576e8e5..2e8abf0 100644 --- a/src/tsock.c +++ b/src/tsock.c @@ -79,4 +79,62 @@ int exitMax(int var,int tailleMax){ exit(EXIT_FAILURE); } return 0; +} + +int testProtocol(void) +{ + char * msg; + msg=formatTextParam(7, 8, 64, 1); + printf("%s\n",msg); + msg=formatTextMessage("aaaaaa",6); + printf("%s\n",msg); + return 0; +} + + +char * formatTextParam(int numEmetteur, int numRecepteur, int tailleMessage, int nbMessage) +{ + char * actualMessage = malloc(sizeof(char)*16); + actualMessage[0]='1'; + gestionOffset(actualMessage, 4,1,numEmetteur); + gestionOffset(actualMessage, 8,5,numRecepteur); + gestionOffset(actualMessage, 12,9,tailleMessage); + gestionOffset(actualMessage, 16,13,nbMessage); + return actualMessage; +} + +char * formatTextMessage(char * message, int tailleMessage) +{ + char * actualMessage = malloc(sizeof(char)*(tailleMessage+1)); + actualMessage[0]='0'; + for(int i=1,j=0;i