tom/cnos-assignment-2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'fix/reformat'

Browse Source
This commit is contained in:
Thomas Wade 2018-11-01 08:43:56 +10:30
commit b20871ae60
2 changed files with 102 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
client1.c
View File

@ -1,8 +1,3 @@
// client1 - client program for demonstrating data transfer over TCP/IP
// This program complies with the GNU Coding Standards found here:
// https://www.gnu.org/prep/standards/html_node/index.html
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <sys/time.h> #include <sys/time.h>
@ -17,14 +12,14 @@
#define BUFFERT 512 #define BUFFERT 512
int duration (struct timeval *start, struct timeval *stop, int duration(struct timeval *start, struct timeval *stop,
struct timeval *delta); struct timeval *delta);
int create_client_socket (int port, char* ipaddr); int create_client_socket(int port, char* ipaddr);
struct sockaddr_in sock_serv; struct sockaddr_in sock_serv;
int main (int argc, char**argv) int main(int argc, char** argv)
{ {
struct timeval start, stop, delta; struct timeval start, stop, delta;
int sfd, fd; int sfd, fd;
@ -85,16 +80,16 @@ int main (int argc, char**argv)
} }
count += m; count += m;
bzero(buf,BUFFERT); bzero(buf, BUFFERT);
n = read(fd,buf,BUFFERT); n = read(fd, buf, BUFFERT);
} }
m = sendto(sfd, buf, 0, 0, (struct sockaddr*) &sock_serv, l); m = sendto(sfd, buf, 0, 0, (struct sockaddr *) &sock_serv, l);
gettimeofday(&stop, NULL); gettimeofday(&stop, NULL);
duration(&start, &stop, &delta); duration(&start, &stop, &delta);
printf("Nombre d'octets transférés : %lld\n", count); printf("Bytes transferred: %lld\n", count);
printf("Sur une taille total de : %lld \n", sz); printf("Total size: %lld \n", sz);
printf("Pour une durée total de : %ld.%d \n", delta.tv_sec, delta.tv_usec); printf("Total duration: %ld.%d \n", delta.tv_sec, delta.tv_usec);
close(sfd); close(sfd);
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }

128
server1.c
View File

@ -1,9 +1,3 @@
/*
* ENGR2782 - CN Assignment
* Your challenge is to format the following code in a readable manner, anwsering the questions in the comments.
*
*/
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <sys/time.h> #include <sys/time.h>
@ -16,11 +10,15 @@
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include <strings.h> #include <strings.h>
#define BUFFERT 512 #define BUFFERT 512
#define BACKLOG 1 #define BACKLOG 1
int create_server_socket (int port);
struct sockaddr_in sock_serv,sock_clt; int create_server_socket(int port);
int main(int argc, char** argv){ struct sockaddr_in sock_serv, sock_clt;
int main(int argc, char** argv)
{
int sfd, fd; int sfd, fd;
unsigned int length = sizeof(struct sockaddr_in); unsigned int length = sizeof(struct sockaddr_in);
long int n, m, count = 0; long int n, m, count = 0;
@ -31,27 +29,38 @@ int main(int argc, char** argv){
time_t intps; time_t intps;
struct tm* tmi; struct tm* tmi;
/* (A) repalce the following line with suitable getopt() functionality */ /* (A) repalce the following line with suitable getopt() functionality */
if(argc!=2) {perror("Usage ./a.out <num_port> <file2send>\n");exit(3);} if (argc != 2)
{
perror("Usage ./a.out <num_port> <file2send>\n");
exit(3);
}
int l; int l;
int yes=1; int yes = 1;
/* The following function call should use; Internet version 4 protocols with a sequenced, reliable, two-way connection based byte streams */ /* The following function call should use; Internet version 4 protocols with a sequenced, reliable, two-way connection based byte streams */
sfd = socket( /* Q) What goes here? */ , /* Q) What goes here? */ , 0); sfd = socket( /* Q) What goes here? */ , /* Q) What goes here? */ , 0);
/* See; man socket */ /* See; man socket */
if (sfd == -1) {perror("socket fail");return EXIT_SUCCESS;} if (sfd == -1)
if(setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR,&yes,sizeof(int)) == -1 ) {perror("setsockopt erreur");exit(5);} {
perror("socket fail");
return EXIT_SUCCESS;
}
if (setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(int)) == -1 )
{
perror("setsockopt erreur");
exit(5);
}
l = sizeof(struct sockaddr_in); l = sizeof(struct sockaddr_in);
bzero(&sock_serv,l); bzero(&sock_serv, l);
/* The following assignment should use; Internet version 4 protocols constant */ /* The following assignment should use; Internet version 4 protocols constant */
sock_serv.sin_family=/* Q) What goes here? */; sock_serv.sin_family =/* Q) What goes here? */;
/* See; man socket */ /* See; man socket */
sock_serv.sin_port = htons(atoi(argv[1])); sock_serv.sin_port = htons(atoi(argv[1]));
@ -60,45 +69,88 @@ int main(int argc, char** argv){
sock_serv.sin_addr.s_addr = htonl(/* Q) What goes here? */); sock_serv.sin_addr.s_addr = htonl(/* Q) What goes here? */);
/* See; man 4 ip */ /* See; man 4 ip */
if (bind(sfd,(struct sockaddr*)&sock_serv,l) == -1) {perror("bind fail"); exit(EXIT_FAILURE);} if (bind(sfd, (struct sockaddr*) &sock_serv, l) == -1)
{
perror("bind fail");
exit(EXIT_FAILURE);
}
bzero(buffer,BUFFERT); bzero(buffer,BUFFERT);
listen(sfd,BACKLOG); listen(sfd,BACKLOG);
/* accept() takes "struct sockaddr_in" and returns non-negative integer that is a descriptor for the accepted socket. /* accept() takes "struct sockaddr_in" and returns non-negative integer that is a descriptor for the accepted socket.
* The missing arguement in the line below will need to have the *address* of the variable required, as the value is updated when the socket is update. eg, &variable * The missing arguement in the line below will need to have the *address* of the variable required, as the value is updated when the socket is update. eg, &variable
*/ */
nsid = accept(sfd, (struct sockaddr*)&sock_clt, /* Q) What goes here? */); nsid = accept(sfd, (struct sockaddr*) &sock_clt, /* Q) What goes here? */);
/* See; man 2 accept */ /* See; man 2 accept */
if (nsid == -1) {perror("accept fail"); return EXIT_FAILURE;} if (nsid == -1)
else { {
if(inet_ntop(AF_INET,&sock_clt.sin_addr,dst,INET_ADDRSTRLEN)==NULL) {perror("erreur socket");exit (4);} perror("accept fail");
clt_port=ntohs(sock_clt.sin_port); return EXIT_FAILURE;
printf("connection : %s:%d\n",dst,clt_port); }
bzero(filename,256); else
{
if(inet_ntop(AF_INET, &sock_clt.sin_addr, dst, INET_ADDRSTRLEN) == NULL)
{
perror("erreur socket");
exit (4);
}
clt_port = ntohs(sock_clt.sin_port);
printf("connection : %s:%d\n", dst, clt_port);
bzero(filename, 256);
intps = time(NULL); intps = time(NULL);
tmi = localtime(&intps); tmi = localtime(&intps);
bzero(filename,256);
sprintf(filename,"saved-file.%d.%d.%d.%d.%d.%d", tmi->tm_mday, tmi->tm_mon+1, 1900+tmi->tm_year, tmi->tm_hour, tmi->tm_min, tmi->tm_sec); bzero(filename, 256);
sprintf(filename, "saved-file.%d.%d.%d.%d.%d.%d", tmi->tm_mday, tmi->tm_mon+1, 1900+tmi->tm_year, tmi->tm_hour, tmi->tm_min, tmi->tm_sec);
printf("Creating the copied output file : %s\n", filename); printf("Creating the copied output file : %s\n", filename);
if ((fd = open(filename, O_CREAT|O_WRONLY, 0600)) == -1) {perror("open fail"); exit (3);}
bzero(buffer,BUFFERT); if ((fd = open(filename, O_CREAT | O_WRONLY, 0600)) == -1)
n=recv(nsid,buffer,BUFFERT,0); {
while(n) { perror("open fail");
if(n==-1) {perror("recv fail");exit(5);} exit(3);
if((m=write(fd,buffer,n))==-1) {perror("write fail");exit (6);}
count=count+m;
bzero(buffer,BUFFERT);
n=recv(nsid,buffer,BUFFERT,0);
} }
bzero(buffer, BUFFERT);
n = recv(nsid, buffer, BUFFERT, 0);
while(n)
{
if (n==-1)
{
perror("recv fail");
exit(5);
}
if ((m=write(fd,buffer,n))==-1)
{
perror("write fail");
exit(6);
}
count += m;
bzero(buffer, BUFFERT);
n = recv(nsid, buffer, BUFFERT, 0);
}
close(sfd); close(sfd);
close(fd); close(fd);
} }
close(nsid); close(nsid);
printf("End of transmission with %s.%d\n",dst,clt_port); printf("End of transmission with %s.%d\n", dst, clt_port);
/* Select the appropriate variable in the following function call argument */ /* Select the appropriate variable in the following function call argument */
printf("Number of octets received : %ld \n", /* Q) What goes here? */); printf("Number of octets received : %ld \n", /* Q) What goes here? */);
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }