Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
5d2f912738
|
@ -49,9 +49,9 @@ int multicastTerminal(struct middleware_arg* arg){
|
||||||
/* [1] Gestion de la requête
|
/* [1] Gestion de la requête
|
||||||
=========================================================*/
|
=========================================================*/
|
||||||
/* 1. On parse la requête */
|
/* 1. On parse la requête */
|
||||||
memcpy(&request.flags, buffer, sizeof(char));
|
memcpy(&request.flags, buffer, sizeof(char));
|
||||||
memcpy(&request.addr, buffer+sizeof(char), sizeof(char)*15);
|
memcpy(&request.addr, buffer+sizeof(char), sizeof(in_addr_t));
|
||||||
memcpy(&request.port, buffer+sizeof(char)*16, sizeof(unsigned short));
|
memcpy(&request.port, buffer+sizeof(char)+sizeof(in_addr_t), sizeof(unsigned short));
|
||||||
printf("{%s} received: bind_header{flag = %d; addr = %x; port = %d}\n", arg->entity, (int) request.flags, ntohl(request.addr), request. port);
|
printf("{%s} received: bind_header{flag = %d; addr = %x; port = %d}\n", arg->entity, (int) request.flags, ntohl(request.addr), request. port);
|
||||||
|
|
||||||
/* 2. Si mauvais flag (avion) */
|
/* 2. Si mauvais flag (avion) */
|
||||||
|
@ -117,9 +117,9 @@ int multicastTerminal(struct middleware_arg* arg){
|
||||||
=========================================================*/
|
=========================================================*/
|
||||||
/* 1. On sérialise la réponse */
|
/* 1. On sérialise la réponse */
|
||||||
bzero(buffer, MAX_BUF_LEN*sizeof(char));
|
bzero(buffer, MAX_BUF_LEN*sizeof(char));
|
||||||
memcpy(buffer, &request.flags, sizeof(char));
|
memcpy(buffer, &request.flags, sizeof(char));
|
||||||
memcpy(buffer+sizeof(char), &request.addr, sizeof(in_addr_t));
|
memcpy(buffer+sizeof(char), &request.addr, sizeof(in_addr_t));
|
||||||
memcpy(buffer+sizeof(char)*16, &request.port, sizeof(unsigned short));
|
memcpy(buffer+sizeof(char)+sizeof(in_addr_t), &request.port, sizeof(unsigned short));
|
||||||
|
|
||||||
/* 2. On envoie la réponse*/
|
/* 2. On envoie la réponse*/
|
||||||
len = sizeof(struct sockaddr_in);
|
len = sizeof(struct sockaddr_in);
|
||||||
|
|
Loading…
Reference in New Issue