| Lantzvillian |
02-17-2011 04:09 PM |
hey dwhitney67,
No I haven't gotten all of my issues out of the way. I have a couple of your points fixed, but I am still being blocked I think.
The reason for the sleep(9) is that the client sends a packet every 9 seconds or so and it keeps the connection open. If I don't have a sleep it will print out the buffer x times and sends a reset closing the comms to the client.
Here is my updated server:
Code:
#include <assert.h>
#include <errno.h>
#include <fcntl.h>
#include <netinet/in.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/epoll.h>
#include <sys/socket.h>
#include <sys/types.h>
#include <unistd.h>
#include <netdb.h>
#include <strings.h>
#include <string.h>
#include <arpa/inet.h>
#include <unistd.h>
#include <signal.h>
#define TRUE 1
#define FALSE 0
#define EPOLL_QUEUE_LEN 10000
#define BUFLEN 1024
#define SERVER_PORT 7000
//Globals
int fd_server;
struct clientStuff
{
int sockfd;
struct sockaddr_in client;
};
// Function prototypes
static void SystemFatal (const char* message);
static int ClearSocket (void* arg);
void close_fd (int);
int main (int argc, char* argv[])
{
int i, arg, visits,num_fds, fd_new, epoll_fd;
static struct epoll_event events[EPOLL_QUEUE_LEN], event;
int port = SERVER_PORT;
struct sockaddr_in addr, remote_addr;
socklen_t addr_size = sizeof(struct sockaddr_in);
struct sigaction act;
FILE *fp;
visits = 0;
// set up the signal handler to close the server socket when CTRL-c is received
act.sa_handler = close_fd;
act.sa_flags = 0;
if ((sigemptyset (&act.sa_mask) == -1 || sigaction (SIGINT, &act, NULL) == -1))
{
perror ("Failed to set SIGINT handler");
exit (EXIT_FAILURE);
}
// Create the listening socket
fd_server = socket (AF_INET, SOCK_STREAM, 0);
if (fd_server == -1)
SystemFatal("socket");
// set SO_REUSEADDR so port can be resused imemediately after exit, i.e., after CTRL-c
arg = 1;
if (setsockopt (fd_server, SOL_SOCKET, SO_REUSEADDR, &arg, sizeof(arg)) == -1)
SystemFatal("setsockopt");
// Make the server listening socket non-blocking
if (fcntl (fd_server, F_SETFL, O_NONBLOCK | fcntl (fd_server, F_GETFL, 0)) == -1)
SystemFatal("fcntl");
// Bind to the specified listening port
memset (&addr, 0, sizeof (struct sockaddr_in));
addr.sin_family = AF_INET;
addr.sin_addr.s_addr = htonl(INADDR_ANY);
addr.sin_port = htons(port);
if (bind (fd_server, (struct sockaddr*) &addr, sizeof(addr)) == -1)
SystemFatal("bind");
// Listen for fd_news; SOMAXCONN is 128 by default
if (listen (fd_server, SOMAXCONN) == -1)
SystemFatal("listen");
// Create the epoll file descriptor
epoll_fd = epoll_create(EPOLL_QUEUE_LEN);
if (epoll_fd == -1)
SystemFatal("epoll_create");
// Add the server socket to the epoll event loop
event.events = EPOLLIN | EPOLLERR | EPOLLHUP | EPOLLET;
event.data.fd = fd_server;
if (epoll_ctl (epoll_fd, EPOLL_CTL_ADD, fd_server, &event) == -1)
SystemFatal("epoll_ctl");
// Execute the epoll event loop
while (TRUE)
{
num_fds = epoll_wait (epoll_fd, events, EPOLL_QUEUE_LEN, -1);
if (num_fds < 0)
SystemFatal ("Error in epoll_wait!");
for (i = 0; i < num_fds; i++)
{
struct clientStuff c1;
// Case 1: Error condition
if (events[i].events & (EPOLLHUP | EPOLLERR))
{
fputs("epoll: EPOLLERR", stderr);
close(events[i].data.fd);
continue;
}
assert (events[i].events & EPOLLIN);
// Case 2: Server is receiving a connection request
if (events[i].data.fd == fd_server)
{
fd_new = accept (fd_server, (struct sockaddr*) &remote_addr, &addr_size);
printf(">> Initializing remote address: %s\n", inet_ntoa(remote_addr.sin_addr));
visits++;
fp=fopen("server-output.txt", "a"); /* Open file */
fprintf(fp, "Connections-to-date,%u\n",visits);
fprintf(fp, "%s,connect\n",inet_ntoa(remote_addr.sin_addr));
fclose(fp);
printf("Connections to date: %u \n",visits);
c1.sockfd = fd_new;
c1.client = remote_addr;
if (fd_new == -1)
{
if (errno != EAGAIN && errno != EWOULDBLOCK)
{
perror("accept");
}
continue;
}
// Make the fd_new non-blocking
if (fcntl (fd_new, F_SETFL, O_NONBLOCK | fcntl(fd_new, F_GETFL, 0)) == -1)
SystemFatal("fcntl");
// Add the new socket descriptor to the epoll loop
event.data.fd = fd_new;
if (epoll_ctl (epoll_fd, EPOLL_CTL_ADD, fd_new, &event) == -1)
SystemFatal ("epoll_ctl");
continue;
}
// Case 3: One of the sockets has read data
if (!ClearSocket(&c1))
{
// epoll will remove the fd from its set
// automatically when the fd is closed
close(events[i].data.fd);
}
}
}
close(fd_server);
exit (EXIT_SUCCESS);
}
/*
* Function that contains the work for every client
*/
static int ClearSocket (void* arg)
{
struct clientStuff *ptr;
struct sockaddr_in client_addr;
int bytes_to_read, sockfd;
char *bp, buf[BUFLEN];
ssize_t n;
FILE *fp;
// sockfd = arg;
ptr = (struct clientStuff *)arg;
sockfd = ptr->sockfd;
client_addr = ptr->client;
bp = buf;
bytes_to_read = BUFLEN -1;
while(1) {
if((n = read(sockfd, bp, bytes_to_read)) == -1) {
printf("read-error");
//return 1;
}
bp += n;
bytes_to_read -= n;
if (bytes_to_read <= 0)
{
/* File I/O Preparations */
fp=fopen("server-output.txt", "a");
fprintf(fp,"%s,Recv,%s\n",inet_ntoa(client_addr.sin_addr), buf);
printf("%s,Recv,%s\n", inet_ntoa(client_addr.sin_addr), buf);
//continue;
}
if((write(sockfd, "DATA-ACK", strlen("DATA-ACK"))) == -1) {
fprintf(fp, "%s,Disconnect\n",inet_ntoa(client_addr.sin_addr));
fclose(fp);
printf("Error on read\n");
close(sockfd);
return 0;
}
// fprintf(fp, "%s,Sent,DATA-ACK\n",inet_ntoa(client_addr.sin_addr));
fclose(fp);
sleep(9);
//return 0;
}
return 1;
}
/*
* Prints the error stored in errno and aborts the program.
*/
static void SystemFatal(const char* message)
{
perror (message);
exit (EXIT_FAILURE);
}
/*
* close fd
*/
void close_fd (int signo)
{
close(fd_server);
//exit (EXIT_SUCCESS);
}
Here is the client in case you want to compile it.. it is ran with ./client.o address 0 yourMessage
0 means send unlimited..
Code:
#include <stdio.h>
#include <netdb.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <errno.h>
#include <stdlib.h>
#include <strings.h>
#include <arpa/inet.h>
#include <sys/time.h>
#include <time.h>
#include <unistd.h>
#include <string.h>
#include <signal.h>
#define SERVER_TCP_PORT 7000 // Default port
#define BUFLEN 1024 // Buffer length
int sent = 0;
int acked = 0;
int main (int argc, char **argv)
{
int n,bytes_to_read, maxmessages, sd, port;
char *host, *bp, rbuf[BUFLEN], **pptr, sbuf[BUFLEN];
struct hostent *hp;
struct sockaddr_in server;
char str[16];
pid_t getpid(void);
n=0;
switch(argc)
{
case 2:
host = argv[1]; // Host name
port = SERVER_TCP_PORT;
maxmessages = 0;
break;
case 3:
host = argv[1];
port = SERVER_TCP_PORT; // User specified port
maxmessages = atoi(argv[2]);
break;
case 4:
host = argv[1];
port = SERVER_TCP_PORT; // User specified port
maxmessages = atoi(argv[2]);
memcpy(sbuf,argv[3],BUFLEN);
break;
default:
fprintf(stderr, "Usage: %s host # of message\n", argv[0]);
exit(1);
}
// Create the socket
if ((sd = socket(AF_INET, SOCK_STREAM, 0)) == -1)
{
perror("Cannot create socket");
exit(1);
}
bzero((char *)&server, sizeof(struct sockaddr_in));
server.sin_family = AF_INET;
server.sin_port = htons(port);
if ((hp = gethostbyname(host)) == NULL)
{
fprintf(stderr, "Unknown server address\n");
exit(1);
}
bcopy(hp->h_addr, (char *)&server.sin_addr, hp->h_length);
// Connecting to the server
if (connect (sd, (struct sockaddr *)&server, sizeof(server)) == -1)
{
fprintf(stderr, "Can't connect to server\n");
perror("connect");
exit(1);
}
printf("Connected:\nServer Name: %s\n", hp->h_name);
pptr = hp->h_addr_list;
printf("\t\tIP Address: %s\n", inet_ntop(hp->h_addrtype, *pptr, str, sizeof(str)));
if (argv[3] == NULL) {
printf("ENTER DATA TO BE SENT\n");
fgets (sbuf, BUFLEN, stdin);
}
while(1){
if ( maxmessages == 0 ) {
for(;;) {
FILE *fp;
// Transmit data through the socket
printf("\nTransmiting %u:\n", sent);
send(sd, sbuf, BUFLEN, 0);
/* Time start stuff */
char buffer[30];
struct timeval tv;
time_t curtime;
/* File I/O Preparations */
fp=fopen("client-output.txt", "a"); /* Open file */
/* Start time */
gettimeofday(&tv, NULL);
curtime=tv.tv_sec;
strftime(buffer,30,"%m-%d-%Y %T.",localtime(&curtime));
fprintf(fp, "%u,Sent,%u,%ld\n",getpid(),sent,tv.tv_usec); /* Print start time */
sent++;
printf("Receiving %u:", acked);
bp = rbuf;
bytes_to_read = strlen("DATA-ACK");
// client makes repeated calls to recv until no more data is expected to arrive.
bp += n;
bytes_to_read -= n;
if (bytes_to_read <= 0)
{
printf("ACK\n");
memset(rbuf,0,sizeof(rbuf));
}
/* Start time */
gettimeofday(&tv, NULL);
curtime=tv.tv_sec;
strftime(buffer,30,"%m-%d-%Y %T.",localtime(&curtime));
fprintf(fp, "%u,Recv,%u,%ld\n",getpid(),acked,tv.tv_usec); /* Print start time */
fclose(fp);
acked++;
sleep(10);
}
}
else {
while(sent <= maxmessages) {
FILE *fp;
// Transmit data through the socket
printf("Transmiting %u:\n", sent);
send(sd, sbuf, BUFLEN, 0);
/* Time start stuff */
char buffer[30];
struct timeval tv;
time_t curtime;
/* File I/O Preparations */
fp=fopen("client-output.txt", "a"); /* Open file */
/* Start time */
gettimeofday(&tv, NULL);
curtime=tv.tv_sec;
strftime(buffer,30,"%m-%d-%Y %T.",localtime(&curtime));
fprintf(fp, "%u,Sent,%u,%ld,\n",getpid(),sent,tv.tv_usec); /* Print start time */
sent++;
printf("Receiving %u:", acked);
bp = rbuf;
bytes_to_read = strlen("DATA-ACK");
// client makes repeated calls to recv until no more data is expected to arrive.
bp += n;
bytes_to_read -= n;
if (bytes_to_read <= 0)
{
printf("ACK\n");
memset(rbuf,0,sizeof(rbuf));
}
/* Start time */
gettimeofday(&tv, NULL);
curtime=tv.tv_sec;
strftime(buffer,30,"%m-%d-%Y %T.",localtime(&curtime));
fprintf(fp, "%u,Recv,%u,%ld,\n",getpid(),acked,tv.tv_usec); /* Print start time */
fclose(fp);
acked++;
sleep(10);
}
fflush(stdout);
close (sd);
return (0);
}
}
fflush(stdout);
close (sd);
return (0);
}
|
