projects
/
gapil.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Altre modifiche
[gapil.git]
/
sources
/
TCP_echod.c
diff --git
a/sources/TCP_echod.c
b/sources/TCP_echod.c
index 08d926f5d462b700d0888e754472a8e8546013d2..049155744c919942c335a3a5f3b818ce0005990f 100644
(file)
--- a/
sources/TCP_echod.c
+++ b/
sources/TCP_echod.c
@@
-26,7
+26,7
@@
*
* Usage: echod -h give all info
*
*
* Usage: echod -h give all info
*
- * $Id: TCP_echod.c,v 1.
4 2003/06/18 21:19:24
piccardi Exp $
+ * $Id: TCP_echod.c,v 1.
8 2003/07/27 14:28:19
piccardi Exp $
*
****************************************************************/
/*
*
****************************************************************/
/*
@@
-41,6
+41,7
@@
#include <syslog.h> /* syslog system functions */
#include <signal.h> /* signal functions */
#include <errno.h> /* error code */
#include <syslog.h> /* syslog system functions */
#include <signal.h> /* signal functions */
#include <errno.h> /* error code */
+#include <string.h> /* error code */
#include "Gapil.h"
#define BACKLOG 10
#include "Gapil.h"
#define BACKLOG 10
@@
-58,9
+59,11
@@
int main(int argc, char *argv[])
* Variables definition
*/
int list_fd, conn_fd;
* Variables definition
*/
int list_fd, conn_fd;
- int waiting;
+ int waiting
= 0
;
pid_t pid;
pid_t pid;
- struct sockaddr_in serv_add;
+ struct sockaddr_in serv_add, cli_add;
+ socklen_t len;
+ char debug[MAXLINE], ipaddr[20];
/*
* Input section: decode parameters passed in the calling
* Use getopt function
/*
* Input section: decode parameters passed in the calling
* Use getopt function
@@
-142,12
+145,21
@@
int main(int argc, char *argv[])
/* handle echo to client */
while (1) {
/* accept connection */
/* handle echo to client */
while (1) {
/* accept connection */
- while (((conn_fd = accept(list_fd,
NULL, NULL)) < 0
)
- && (errno == EINTR));
+ while (((conn_fd = accept(list_fd,
(struct sockaddr *)&cli_add, &len)
)
+
< 0)
&& (errno == EINTR));
if ( conn_fd < 0) {
PrintErr("accept error");
exit(1);
}
if ( conn_fd < 0) {
PrintErr("accept error");
exit(1);
}
+ if (debugging) {
+ inet_ntop(AF_INET, &cli_add.sin_addr, ipaddr, sizeof(ipaddr));
+ snprintf(debug, MAXLINE, "Accepted connection form %s\n", ipaddr);
+ if (demonize) {
+ syslog(LOG_DEBUG, debug);
+ } else {
+ printf("%s", debug);
+ }
+ }
/* fork to handle connection */
if ( (pid = fork()) < 0 ){
PrintErr("fork error");
/* fork to handle connection */
if ( (pid = fork()) < 0 ){
PrintErr("fork error");
@@
-172,8
+184,9
@@
void usage(void) {
printf("Usage:\n");
printf(" echod [-h] \n");
printf(" -h print this help\n");
printf("Usage:\n");
printf(" echod [-h] \n");
printf(" -h print this help\n");
- printf(" -d
print
debug info\n");
+ printf(" -d
write
debug info\n");
printf(" -i use interactively\n");
printf(" -i use interactively\n");
+ printf(" -w N wait N sec. before calling accept\n");
exit(1);
}
/*
exit(1);
}
/*
@@
-186,11
+199,29
@@
void ServEcho(int sockfd) {
int size;
/* main loop, reading 0 char means client close connection */
while ( (nread = read(sockfd, buffer, MAXLINE)) != 0) {
int size;
/* main loop, reading 0 char means client close connection */
while ( (nread = read(sockfd, buffer, MAXLINE)) != 0) {
+ if (nread < 0) {
+ snprintf(debug, MAXLINE+20, "Errore in lettura: %s \n",
+ strerror(errno));
+ if (demonize) { /* daemon mode */
+ syslog(LOG_DEBUG, debug);
+ } else {
+ printf("%s", debug);
+ }
+ }
nwrite = FullWrite(sockfd, buffer, nread);
nwrite = FullWrite(sockfd, buffer, nread);
+ if (nwrite < 0) {
+ snprintf(debug, MAXLINE+20, "Errore in scrittura: %s \n",
+ strerror(errno));
+ if (demonize) { /* daemon mode */
+ syslog(LOG_DEBUG, debug);
+ } else {
+ printf("%s", debug);
+ }
+ }
if (debugging) {
buffer[nread] = 0;
snprintf(debug, MAXLINE+20, "Letti %d byte, %s", nread, buffer);
if (debugging) {
buffer[nread] = 0;
snprintf(debug, MAXLINE+20, "Letti %d byte, %s", nread, buffer);
- if (demonize) { /*
go daemon
*/
+ if (demonize) { /*
daemon mode
*/
syslog(LOG_DEBUG, debug);
} else {
printf("%s", debug);
syslog(LOG_DEBUG, debug);
} else {
printf("%s", debug);
@@
-203,7
+234,7
@@
void ServEcho(int sockfd) {
* routine to print error on stout or syslog
*/
void PrintErr(char * error) {
* routine to print error on stout or syslog
*/
void PrintErr(char * error) {
- if (demonize) { /*
go daemon
*/
+ if (demonize) { /*
daemon mode
*/
syslog(LOG_ERR, error);
} else {
perror(error);
syslog(LOG_ERR, error);
} else {
perror(error);