bfu/3MICTCP
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

ajouts quelques commentaires/relecture

Browse source
This commit is contained in:
Léonie 2022-04-11 01:34:59 +02:00
parent 4406108f8a
commit d79d9acf4c
1 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/mictcp.c
View file

@ -23,6 +23,7 @@
int mic_tcp_socket(start_mode sm) int mic_tcp_socket(start_mode sm)
{ {
//ajouter return -1 en cas d'erreur
int result=-1; int result=-1;
printf("[MIC-TCP] Appel de la fonction: "); printf(__FUNCTION__); printf("\n"); printf("[MIC-TCP] Appel de la fonction: "); printf(__FUNCTION__); printf("\n");
result = initialize_components(sm); /* Appel obligatoire */ result = initialize_components(sm); /* Appel obligatoire */
@ -58,9 +59,16 @@ int mic_tcp_accept(int socket, mic_tcp_sock_addr* addr)
printf("Je vais dormir\n"); printf("Je vais dormir\n");
pthread_cond_wait(&cond,&mutex); pthread_cond_wait(&cond,&mutex);
printf("Je suis réveillé\n");*/ printf("Je suis réveillé\n");*/
sock.state = CONNECTED;
//retourne 0 si sock.state = established, -1 sinon
if (sock.fd == socket){
sock.state == CONNECTED;
return 0; return 0;
} else {
return -1;
}
} }
/* /*
@ -130,6 +138,9 @@ int mic_tcp_connect(int socket, mic_tcp_sock_addr addr)
printf("Erreur d'envoi du pdu"); printf("Erreur d'envoi du pdu");
exit(1); exit(1);
}*/ }*/
//se servir de addr et sock.addr + refaire condition pour avoir 0 ou -1 et c'est tout ??
printf("Connected\n"); printf("Connected\n");
sock.state=CONNECTED; sock.state=CONNECTED;
return 0; return 0;
@ -148,16 +159,20 @@ int mic_tcp_send (int mic_sock, char* mesg, int mesg_size)
printf("[MIC-TCP] Appel de la fonction: "); printf(__FUNCTION__); printf("\n"); printf("[MIC-TCP] Appel de la fonction: "); printf(__FUNCTION__); printf("\n");
//construction pdu
pdu.header.syn = 0; pdu.header.syn = 0;
pdu.header.ack = 0; pdu.header.ack = 0;
pdu.header.fin = 0; pdu.header.fin = 0;
pdu.header.seq_num= PE; pdu.header.seq_num= PE;
//payload
pdu.payload.data = mesg; pdu.payload.data = mesg;
pdu.payload.size=mesg_size; pdu.payload.size=mesg_size;
mic_tcp_pdu mem = pdu; mic_tcp_pdu mem = pdu;
//printf("%d\n",pdu.header.seq_num); //printf("%d\n",pdu.header.seq_num);
//envoi du pdu
if((sent=IP_send(pdu,sock.addr))==-1){ if((sent=IP_send(pdu,sock.addr))==-1){
printf("Erreur d'envoi du pdu"); printf("Erreur d'envoi du pdu");
exit(1); exit(1);
@ -235,6 +250,7 @@ int mic_tcp_recv (int socket, char* mesg, int max_mesg_size)
pdu.payload.data=mesg; pdu.payload.data=mesg;
pdu.payload.size=max_mesg_size; pdu.payload.size=max_mesg_size;
return app_buffer_get(pdu.payload); return app_buffer_get(pdu.payload);
//prendre en compte le cas d'erreur
} }
/* /*
@ -247,6 +263,7 @@ int mic_tcp_close (int socket)
printf("[MIC-TCP] Appel de la fonction : "); printf(__FUNCTION__); printf("\n"); printf("[MIC-TCP] Appel de la fonction : "); printf(__FUNCTION__); printf("\n");
sock.state=CLOSED; sock.state=CLOSED;
return 0; return 0;
//faire cas -1 / 0
} }
/* /*
@ -260,6 +277,7 @@ void process_received_PDU(mic_tcp_pdu pdu, mic_tcp_sock_addr addr)
printf("[MIC-TCP] Appel de la fonction: "); printf(__FUNCTION__); printf("\n"); printf("[MIC-TCP] Appel de la fonction: "); printf(__FUNCTION__); printf("\n");
printf("Paquet recu \n"); printf("Paquet recu \n");
printf("ACK NUM %d\n",pdu.header.seq_num); printf("ACK NUM %d\n",pdu.header.seq_num);
mic_tcp_pdu ack; mic_tcp_pdu ack;
if(pdu.header.seq_num == PA){ if(pdu.header.seq_num == PA){
@ -268,8 +286,14 @@ void process_received_PDU(mic_tcp_pdu pdu, mic_tcp_sock_addr addr)
}else{ }else{
printf("Paquet Ack perdu\n"); printf("Paquet Ack perdu\n");
} }
//construction pdu ack
ack.header.ack=1; ack.header.ack=1;
ack.header.ack_num=PA; ack.header.ack_num=PA;
ack.header.fin=0;
ack.header.syn=0;
//init source port, dest port ??
ack.payload.data =""; ack.payload.data ="";
ack.payload.size=0; ack.payload.size=0;