From 59186f537157ba70b54fea0acb267093a308ff9f Mon Sep 17 00:00:00 2001 From: Flavien Haas Date: Wed, 30 Oct 2019 08:24:54 +0100 Subject: [PATCH] implement sendreceive() --- client_echo.c | 61 ++++++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 28 deletions(-) diff --git a/client_echo.c b/client_echo.c index 8e72c65..1b9222d 100755 --- a/client_echo.c +++ b/client_echo.c @@ -8,7 +8,7 @@ #define BUF_SIZE 500 -struct addrinfo *result; // tableau des adresses réseaux des serveurs +struct addrinfo *result; // tableau des adresses réseaux des serveurs int cree_socket(char* ip, char* port, struct addrinfo hints){ int s = getaddrinfo(ip, port, &hints, &result); @@ -43,30 +43,47 @@ void con_serveur(int *sfd){ } } +void sendreceive(char* argtemp, size_t len, int j, int sfd){ + char buf[BUF_SIZE]; + ssize_t nread; + /* Send remaining command-line arguments as separate + datagrams, and read responses from server */ + if (len + 1 > BUF_SIZE) { + fprintf(stderr, "Ignoring long message in argument %d\n", j); + } + if (write(sfd, argtemp, len) != len) { + fprintf(stderr, "partial/failed write\n"); + exit(EXIT_FAILURE); + } + nread = read(sfd, buf, BUF_SIZE); + if (nread == -1) { + perror("read"); + exit(EXIT_FAILURE); + } + printf("Received %ld bytes: %s\n", (long) nread, buf); +} + int main(int argc, char *argv[]) { struct addrinfo hints; int sfd, s, j; size_t len; - ssize_t nread; - char buf[BUF_SIZE]; + char* argtemp; - if (argc < 3) { // vérification du nombre d'arguments rentrés + if (argc < 3) { // vérification du nombre d'arguments rentrés fprintf(stderr, "mettre: %s ip port message\n", argv[0]); exit(EXIT_FAILURE); } char* ip = argv[1]; char* port = argv[2]; - char* message = argv[3]; // remplissage des varables a partir des arguments passés au programme + char* message = argv[3]; // remplissage des varables a partir des arguments passés au programme /* Obtain address(es) matching host/port */ memset(&hints, 0, sizeof(struct addrinfo)); - hints.ai_family = AF_UNSPEC; /* Allow IPv4 or IPv6 */ - hints.ai_socktype = SOCK_DGRAM; /* Datagram socket */ - hints.ai_flags = 0; - hints.ai_protocol = 0; /* Any protocol */ + hints.ai_family = AF_UNSPEC; // utilisation du serveur sur IPv4/v6 (AF_INET/AF_INET6) + hints.ai_socktype = SOCK_DGRAM; // socket en mode datagramme - s = cree_socket(ip, port, hints); // création du socket + s = cree_socket(ip, port, hints); // création du socket if(s == 1) { exit(EXIT_FAILURE); } @@ -75,26 +92,14 @@ int main(int argc, char *argv[]) { freeaddrinfo(result); /* No longer needed */ - /* Send remaining command-line arguments as separate - datagrams, and read responses from server */ - - for (j = 3; j < argc; j++) { + for (j = 3; j < argc; j++) { // récupère les mots passés en arguments len = strlen(argv[j]) + 1; + argtemp = argv[j]; /* +1 for terminating null byte */ - if (len + 1 > BUF_SIZE) { - fprintf(stderr, "Ignoring long message in argument %d\n", j); - continue; - } - if (write(sfd, argv[j], len) != len) { - fprintf(stderr, "partial/failed write\n"); - exit(EXIT_FAILURE); - } - nread = read(sfd, buf, BUF_SIZE); - if (nread == -1) { - perror("read"); - exit(EXIT_FAILURE); - } - printf("Received %ld bytes: %s\n", (long) nread, buf); + sendreceive(argv[j], len, j, sfd); } + + + exit(EXIT_SUCCESS); }