use syslog instead of /var/adm/rsyncd.log

[rsync/rsync.git] / socket.c

diff --git a/socket.c b/socket.c
index 7027338..5ee31f6 100644 (file)
--- a/socket.c
+++ b/socket.c
@@ -116,7 +116,7 @@ int is_a_socket(int fd)
 }
 
 
-int start_accept_loop(int port, int (*fn)(int ))
+void start_accept_loop(int port, int (*fn)(int ))
 {
        int s;
 
@@ -125,12 +125,12 @@ int start_accept_loop(int port, int (*fn)(int ))
        /* open an incoming socket */
        s = open_socket_in(SOCK_STREAM, port);
        if (s == -1)
-               return(-1);
+               exit(1);
 
        /* ready to listen */
        if (listen(s, 5) == -1) {
                close(s);
-               return -1;
+               exit(1);
        }
 
 
@@ -163,7 +163,6 @@ int start_accept_loop(int port, int (*fn)(int ))
 
                close(fd);
        }
-       return 0;
 }
 
 
@@ -295,3 +294,50 @@ void become_daemon(void)
        close(1);
        close(2);
 }
+
+/*******************************************************************
+ return the IP addr of the client as a string 
+ ******************************************************************/
+char *client_addr(int fd)
+{
+       struct sockaddr sa;
+       struct sockaddr_in *sockin = (struct sockaddr_in *) (&sa);
+       int     length = sizeof(sa);
+       static char addr_buf[100];
+
+       if (getpeername(fd, &sa, &length)) {
+               exit(1);
+       }
+
+       strlcpy(addr_buf,(char *)inet_ntoa(sockin->sin_addr), sizeof(addr_buf)-1);
+
+       return addr_buf;
+}
+
+
+/*******************************************************************
+ return the DNS name of the client 
+ ******************************************************************/
+char *client_name(int fd)
+{
+       struct sockaddr sa;
+       struct sockaddr_in *sockin = (struct sockaddr_in *) (&sa);
+       int     length = sizeof(sa);
+       static char name_buf[100];
+       struct hostent *hp;
+
+       strcpy(name_buf,"UNKNOWN");
+
+       if (getpeername(fd, &sa, &length)) {
+               exit(1);
+       }
+
+       /* Look up the remote host name. */
+       if ((hp = gethostbyaddr((char *) &sockin->sin_addr,
+                               sizeof(sockin->sin_addr),
+                               AF_INET))) {
+               strlcpy(name_buf,(char *)hp->h_name,sizeof(name_buf) - 1);
+       }
+
+       return name_buf;
+}