dadada/netcalc
dadada/netcalc
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

added "client:" and "server:" to some outputs

Browse source
This commit is contained in:
Jan-Frederick Musiol 2018-10-29 11:56:43 +01:00
parent 8dabb3fba8
commit 1e0c461dd4
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
netcalc.c
View file

@ -158,8 +158,6 @@ int parse(char *buf, size_t buflen, unsigned int *first, unsigned int *second, c
char *num2str = NULL; char *num2str = NULL;
char *opstr = NULL; char *opstr = NULL;
ssize_t num_items = sscanf(buf, "%m[x0-9A-Fb]%m[+-*/]%m[x0-9A-Fb]", &num1str, &opstr, &num2str); ssize_t num_items = sscanf(buf, "%m[x0-9A-Fb]%m[+-*/]%m[x0-9A-Fb]", &num1str, &opstr, &num2str);
int status = 0; int status = 0;
@ -217,7 +215,7 @@ int server() {
int c_fd = accept(SOCKFD, (struct sockaddr *)&c_addr, &sin_size); int c_fd = accept(SOCKFD, (struct sockaddr *)&c_addr, &sin_size);
if (c_fd == -1) { if (c_fd == -1) {
perror("accept"); perror("server: accept");
continue; // we do not care continue; // we do not care
} }
@ -226,7 +224,7 @@ int server() {
ssize_t byte_count; ssize_t byte_count;
while ((byte_count = recv(c_fd, buf, sizeof buf, 0)) != 0) { while ((byte_count = recv(c_fd, buf, sizeof buf, 0)) != 0) {
if (byte_count == -1) { if (byte_count == -1) {
perror("recv"); perror("server: recv");
break; break;
} }
@ -248,7 +246,7 @@ int server() {
} }
if (send(c_fd, buf, strlen(buf)+1, 0) == -1) { if (send(c_fd, buf, strlen(buf)+1, 0) == -1) {
perror("send"); perror("server: send");
continue; continue;
} }
} }
@ -275,6 +273,7 @@ int client() {
char *line = (char *) malloc(BUFLEN); char *line = (char *) malloc(BUFLEN);
while (getline(&line, &linesize, stdin) != -1) { while (getline(&line, &linesize, stdin) != -1) {
if (strlen(line) <= 1) { if (strlen(line) <= 1) {
printf("client: closing");
break; break;
} }
@ -287,7 +286,7 @@ int client() {
int status = parse(line, strlen(line)+1, &num1, &num2, &op); int status = parse(line, strlen(line)+1, &num1, &num2, &op);
if (status == -1) { if (status == -1) {
report_error(buf, BUFLEN, "parse: failed to parse"); report_error(buf, BUFLEN, "client: failed to parse");
continue; continue;
} else if (status == -2) { } else if (status == -2) {
sprintf(buf, "%u%c%s", num1, '+', "0"); sprintf(buf, "%u%c%s", num1, '+', "0");
@ -296,13 +295,13 @@ int client() {
} }
if (send(SOCKFD, buf, strlen(buf)+1, 0) == -1) { if (send(SOCKFD, buf, strlen(buf)+1, 0) == -1) {
perror("error on send"); perror("client: error on send");
continue; continue;
} }
memset(buf, 0, BUFLEN); memset(buf, 0, BUFLEN);
ssize_t re_bytes_c = recv(SOCKFD, buf, sizeof buf, 0); ssize_t re_bytes_c = recv(SOCKFD, buf, sizeof buf, 0);
if (re_bytes_c == -1) { if (re_bytes_c == -1) {
perror("error on receive"); perror("client: error on receive");
continue; continue;
} }
printf("%s", buf); printf("%s", buf);