diff --git a/header/bal.h b/header/bal.h index 204ac2e..a173347 100644 --- a/header/bal.h +++ b/header/bal.h @@ -43,6 +43,7 @@ struct elementMessage * initElementMessage(void); struct listeMessage * initListeMessage(void); void ajoutListeMessage(struct listeMessage * listeActuel,messageBAL * leMessage); void afficheListeMessage(struct listeMessage listeActuel); +int bal(void); BAL * creerBAL(int idRecepteur, struct listeMessage * messageRecepteur); struct elementBAL * initElementBAL(void); diff --git a/header/tsock.h b/header/tsock.h index c0037ec..2f6e7d3 100644 --- a/header/tsock.h +++ b/header/tsock.h @@ -21,4 +21,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/main.c b/src/main.c index fdbf2f2..f0163a6 100644 --- a/src/main.c +++ b/src/main.c @@ -5,6 +5,7 @@ int main (int argc, char **argv) { char usageChar[100]="usage: cmd [-p|-s]|[-u][-u|-r ##|-e ##|-b][-n ##][-l ##] port ipAdress\n"; + testProtocol(); char *ipAddress; extern char *optarg; extern int optind; 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