para_client: use the error subsystem
authorAndre <maan@p133.(none)>
Tue, 6 Jun 2006 08:33:17 +0000 (10:33 +0200)
committerAndre <maan@p133.(none)>
Tue, 6 Jun 2006 08:33:17 +0000 (10:33 +0200)
Makefile.in
client.c
configure.ac
error.h
http_recv.c
net.c
net.h

index 1221039..f7c7f1b 100644 (file)
@@ -93,7 +93,6 @@ tarball_add := $(gengetopts_c) $(gengetopts_h) $(autocrap)
 all: $(BINARIES)
 www: $(gen_html) $(gruta_html) $(web_pics) $(web_misc) $(shots) tags doxygen doc
 
-client_objs = client.cmdline.o client.o net.o string.o crypt.o
 sdl_gui_objs = sdl_gui.cmdline.o SFont.o sdl_gui.o gui_common.o exec.o \
        close_on_fork.o string.o stat.o fd.o
 dbadm_objs = dbadm.o exec.o close_on_fork.o string.o
@@ -178,8 +177,8 @@ para_filter: @filter_objs@
 para_slider: $(slider_objs)
        $(CC) $(slider_objs) -o $@ @GTK_LIBS@ @GLIB_LIBS@ -lzmw
 
-para_client: $(client_objs)
-       $(CC) -o $@ $(client_objs) $(SSL_LDFLAGS) $(SSL_LIBS)
+para_client: @client_objs@
+       $(CC) -o $@ @client_objs@ @client_ldflags@
 
 para_gui: @gui_objs@
        $(CC) -o $@ @gui_objs@ -lncurses
index 914c5fb..a28be42 100644 (file)
--- a/client.c
+++ b/client.c
 #include <openssl/rc4.h>
 #include "net.h"
 #include "string.h"
+#include "error.h"
 
 struct gengetopt_args_info args_info;
 
+INIT_CLIENT_ERRLISTS;
+
 /*
  * client log function
  */
 void para_log(int ll, const char* fmt,...)
 {
        va_list argp;
-       FILE *outfd;
 
        /* ignore log message if loglevel is not high enough */
        if (ll < args_info.loglevel_arg)
@@ -45,7 +47,7 @@ void para_log(int ll, const char* fmt,...)
        va_end(argp);
 }
 
-void get_options(int argc, char *argv[],
+static int get_options(int argc, char *argv[],
        char **config_file, char **key_file)
 {
        char *home;
@@ -74,17 +76,15 @@ void get_options(int argc, char *argv[],
        else
                *config_file = args_info.config_file_arg;
        ret = stat(*config_file, &statbuf);
-       if (ret && args_info.config_file_given) {
-               fprintf(stderr, "can not stat config file %s\n",
-                       args_info.config_file_arg);
-               exit(EXIT_FAILURE);
-       }
+       if (ret && args_info.config_file_given)
+               return -E_NO_CONFIG;
        if (!ret)
                cmdline_parser_configfile(*config_file, &args_info, 0, 0, 0);
        if (!args_info.key_file_given)
                *key_file = default_key_file;
        else
                *key_file = args_info.key_file_arg;
+       return 1;
 }
 
 static RC4_KEY rc4_recv_key;
@@ -114,13 +114,30 @@ static void append_str(char **data, const char* append)
                *data = para_strdup(append);
 }
 
+
+static int send_stdin(int fd)
+{
+       char buf[8192];
+       int ret;
+
+       PARA_NOTICE_LOG("%s", "sending stdin\n");
+       for (;;) {
+               ret = read(STDIN_FILENO, buf, sizeof(buf));
+               if (ret <= 0)
+                       return ret;
+               ret = send_bin_buffer(fd, buf, ret);
+               if (ret < 0)
+                       return ret;
+       }
+       return 1;
+}
 /*
  * MAIN
  */
 int main(int argc, char *argv[])
 {
 
-       int sockfd, numbytes, i, received, ret;
+       int sockfd = -1, numbytes, i, received, ret;
        struct hostent *he;
        struct sockaddr_in their_addr;
        char *command = NULL;
@@ -129,7 +146,9 @@ int main(int argc, char *argv[])
        char *key_file, *config_file;
        long unsigned challenge_nr;
 
-       get_options(argc, argv, &config_file, &key_file);
+       ret = get_options(argc, argv, &config_file, &key_file);
+       if (ret < 0)
+               goto out;
        if (args_info.loglevel_arg <= NOTICE)
                cmdline_parser_print_version();
        PARA_INFO_LOG(
@@ -143,81 +162,81 @@ int main(int argc, char *argv[])
                args_info.hostname_arg,
                args_info.server_port_arg
        );
-       if (!args_info.inputs_num) {
-               PARA_ERROR_LOG("%s", "syntax error\n");
-               exit(EXIT_FAILURE);
-       }
+       ret = - E_CLIENT_SYNTAX;
+       if (!args_info.inputs_num)
+               goto out;
        /* concat args */
        for (i = 0; i < args_info.inputs_num; i++)
                append_str(&command, args_info.inputs[i]);
-
        crypt_function_recv = NULL;
        crypt_function_send = NULL;
        /* get the host info */
        PARA_NOTICE_LOG("getting host info of %s\n",
                args_info.hostname_arg);
-       if (!(he = get_host_info(args_info.hostname_arg)))
-               exit(EXIT_FAILURE);
+       ret = get_host_info(args_info.hostname_arg, &he);
+       if (ret < 0)
+               goto out;
        /* get new socket */
-       if ((sockfd = get_socket()) < 0)
-               exit(EXIT_FAILURE);
+       ret = get_socket();
+       if (ret < 0)
+               goto out;
+       sockfd = ret;
        /* init their_addr */
        init_sockaddr(&their_addr, args_info.server_port_arg, he);
-       /* Connect */
-       PARA_NOTICE_LOG("connecting to %s...\n",
-               args_info.hostname_arg);
-       if (para_connect(sockfd, &their_addr) < 0)
-               exit(EXIT_FAILURE);
-       /* Receive Welcome message */
-       if ((numbytes = recv_buffer(sockfd, buf, sizeof(buf))) < 0)
-               exit(EXIT_FAILURE);
+       /* connect */
+       PARA_NOTICE_LOG("connecting to %s\n", args_info.hostname_arg);
+       ret = para_connect(sockfd, &their_addr);
+       if (ret < 0)
+               goto out;
+       /* receive welcome message */
+       ret = recv_buffer(sockfd, buf, sizeof(buf));
+       if (ret < 0)
+               goto out;
        /* send auth command */
        auth_str = make_message("auth %s%s", args_info.plain_given?  "" : "rc4 ",
                args_info.user_arg);
        PARA_INFO_LOG("<-- %s--> %s\n", buf, auth_str);
-       if (send_buffer(sockfd, auth_str) < 0)
-               exit(EXIT_FAILURE);
+       ret = send_buffer(sockfd, auth_str);
+       if (ret < 0)
+               goto out;
        /* receive challenge number */
-       if ((numbytes = recv_buffer(sockfd, buf, sizeof(buf))) < 0)
-               exit(EXIT_FAILURE);
-       if (numbytes != 64) {
-               PARA_EMERG_LOG("did not receive valid challenge (got %i bytes)\n",
-                       numbytes);
-               buf[numbytes] = '\0';
-               PARA_ERROR_LOG("received the following instead: %s\n", buf);
-               exit(EXIT_FAILURE);
+       ret = recv_buffer(sockfd, buf, sizeof(buf));
+       if (ret < 0)
+               goto out;
+       if (ret != 64) {
+               ret = -E_INVALID_CHALLENGE;
+               PARA_ERROR_LOG("received the following: %s\n", buf);
+               goto out;
        }
-       PARA_INFO_LOG("<-- [challenge (%i bytes)]\n", numbytes);
+       PARA_INFO_LOG("%s", "<-- [challenge]\n");
        /* decrypt challenge number */
-       ret = para_decrypt_challenge(key_file, &challenge_nr, (unsigned char *) buf,
-               numbytes);
-       if (ret < 0) {
-               PARA_EMERG_LOG("decrypt error (%d). Bad secret key?\n", ret);
-               exit(EXIT_FAILURE);
-       }
+       ret = para_decrypt_challenge(key_file, &challenge_nr, (unsigned char *) buf, 64);
+       if (ret < 0)
+               goto out;
        /* send decrypted challenge */
        PARA_INFO_LOG("--> %lu\n", challenge_nr);
-       if (send_va_buffer(sockfd, "%s%lu", CHALLENGE_RESPONSE_MSG, challenge_nr) < 0)
-               exit(EXIT_FAILURE);
-       /* Wait for approval */
+       ret = send_va_buffer(sockfd, "%s%lu", CHALLENGE_RESPONSE_MSG, challenge_nr);
+       if (ret < 0)
+               goto out;
+       /* wait for approval */
        PARA_NOTICE_LOG("%s", "waiting for approval from server\n");
-       if ((numbytes = recv_buffer(sockfd, buf, sizeof(buf))) < 0)
-               exit(EXIT_FAILURE);
+       ret = recv_buffer(sockfd, buf, sizeof(buf));
+       if (ret < 0)
+               goto out;
+       numbytes = ret;
        PARA_INFO_LOG("++++ server info ++++\n%s\n++++ end of server "
                "info ++++\n", buf);
-       /* Check if server has sent "Proceed" message */
-       if (!strstr(buf, PROCEED_MSG)) {
-               PARA_EMERG_LOG("%s", "authentication failed\n");
-               exit(EXIT_FAILURE);
-       }
+       /* check if server has sent "Proceed" message */
+       ret = -E_CLIENT_AUTH;
+       if (!strstr(buf, PROCEED_MSG))
+               goto out;
        if (numbytes >= PROCEED_MSG_LEN + 32) {
                PARA_INFO_LOG("%s", "decrypting session key\n");
-               if (para_decrypt_buffer(key_file, rc4_buf,
-                               (unsigned char *)buf + PROCEED_MSG_LEN + 1,
-                               numbytes - PROCEED_MSG_LEN - 1) < 0) {
-                       PARA_EMERG_LOG("%s", "error receiving rc4 key\n");
-                       exit(EXIT_FAILURE);
-               }
+               ret = para_decrypt_buffer(key_file, rc4_buf,
+                       (unsigned char *)buf + PROCEED_MSG_LEN + 1,
+                       numbytes - PROCEED_MSG_LEN - 1);
+               if (ret < 0)
+                       goto out;
                RC4_set_key(&rc4_send_key, RC4_KEY_LEN, rc4_buf);
                RC4_set_key(&rc4_recv_key, RC4_KEY_LEN, rc4_buf + RC4_KEY_LEN);
                PARA_INFO_LOG("rc4 encrytion activated: %x:%x:%x:%x\n",
@@ -227,33 +246,40 @@ int main(int argc, char *argv[])
        }
        /* send command */
        PARA_INFO_LOG("--> %s\n", command);
-       if (send_buffer(sockfd, command) < 0)
-               exit(EXIT_FAILURE);
+       ret = send_buffer(sockfd, command);
+       if (ret < 0)
+               goto out;
        free(command);
        command = NULL;
-       if (send_buffer(sockfd, EOC_MSG "\n") < 0)
-               exit(EXIT_FAILURE);
+       ret = send_buffer(sockfd, EOC_MSG "\n");
+       if (ret < 0)
+               goto out;
        PARA_NOTICE_LOG("%s", "command sent.\n");
        received = 0;
-       while ((numbytes = recv_bin_buffer(sockfd, buf, sizeof(buf) - 1)) > 0) {
-               buf[numbytes] = '\0';
+       for (;;) {
+               ret = recv_bin_buffer(sockfd, buf, sizeof(buf) - 1);
+               if (ret <= 0) {
+                       if (!ret)
+                               PARA_NOTICE_LOG("%s", "connection closed by peer\n");
+                       goto out;
+               }
+               buf[ret] = '\0';
+               numbytes = ret;
                if (!received && strstr(buf, AWAITING_DATA_MSG)) {
-                       PARA_NOTICE_LOG("%s", "sending stdin\n");
-                       while ((ret = read(STDIN_FILENO, buf,
-                                       sizeof(buf))) > 0) {
-                               if (send_bin_buffer(sockfd, buf, ret) < 0)
-                                       break;
-                       }
-                       PARA_NOTICE_LOG("%s", "closing connection\n");
-                       numbytes = 1;
-                       break;
+                       ret = send_stdin(sockfd);
+                       goto out;
                }
                received = 1;
-               if (write(STDOUT_FILENO, buf, numbytes) != numbytes)
-                       break;
+               ret = write(STDOUT_FILENO, buf, numbytes);
+               if (ret != numbytes) {
+                       ret = -E_SHORT_CLIENT_WRITE;
+                       goto out;
+               }
        }
-       if (!numbytes)
-               PARA_NOTICE_LOG("%s", "connection closed by peer\n");
-       close(sockfd);
-       return ret >= 0? 0: 1;
+out:
+       if (sockfd >= 0)
+               close(sockfd);
+       if (ret < 0)
+               PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+       return ret >= 0? EXIT_SUCCESS: EXIT_FAILURE;
 }
index 7c2c1ec..080b2e3 100644 (file)
@@ -82,6 +82,9 @@ write_errlist_objs="write write_common file_writer time fd string sched stdin"
 write_ldflags=""
 write_writers="file"
 
+client_cmdline_objs="client.cmdline"
+client_errlist_objs="client net string crypt"
+client_ldflags=""
 
 ########################################################################### ssl
 dnl @synopsis CHECK_SSL
@@ -126,10 +129,11 @@ AC_DEFUN([CHECK_SSL],
 ])dnl
 
 AC_ARG_ENABLE(ssldir, [AS_HELP_STRING(--enable-ssldir=path,
-                [Search for openssl also in path.])])
+       [Search for openssl also in path.])])
 if test "$enable_ssldir" = "yes"; then enable_ssldir=""; fi
 CHECK_SSL($enable_ssldir)
 server_ldflags="$srver_ldflags $SSL_LDFLAGS $SSL_LIBS"
+client_ldflags="$client_ldflags $SSL_LDFLAGS $SSL_LIBS"
 
 ########################################################################### ucred
 
@@ -353,6 +357,7 @@ filter_objs="$filter_cmdline_objs $filter_errlist_objs"
 audiod_objs="$audiod_cmdline_objs $audiod_errlist_objs"
 server_objs="$server_cmdline_objs $server_errlist_objs"
 write_objs="$write_cmdline_objs $write_errlist_objs"
+client_objs="$client_cmdline_objs $client_errlist_objs"
 
 AC_SUBST(recv_objs, add_dot_o($recv_objs))
 AC_SUBST(recv_ldflags, $recv_ldflags)
@@ -379,6 +384,11 @@ AC_SUBST(write_ldflags, $write_ldflags)
 AC_DEFINE_UNQUOTED(INIT_WRITE_ERRLISTS,
        objlist_to_errlist($write_errlist_objs), errors used by para_write)
 
+AC_SUBST(client_objs, add_dot_o($client_objs))
+AC_SUBST(client_ldflags, $client_ldflags)
+AC_DEFINE_UNQUOTED(INIT_CLIENT_ERRLISTS,
+       objlist_to_errlist($client_errlist_objs), errors used by para_client)
+
 enum="$(for i in $write_writers; do printf "${i}_WRITE, " | tr '[a-z]' '[A-Z]'; done)"
 AC_DEFINE_UNQUOTED(WRITER_ENUM, $enum NUM_SUPPORTED_WRITERS,
        enum of supported writers)
diff --git a/error.h b/error.h
index 430c12f..5dd750a 100644 (file)
--- a/error.h
+++ b/error.h
@@ -20,6 +20,7 @@
 
 /** \cond list of all subsystems that support the shiny error facility */
 enum para_subsystem {
+       SS_CLIENT,
        SS_SCHED,
        SS_GUI,
        SS_TIME,
@@ -88,6 +89,13 @@ enum para_subsystem {
 extern const char **para_errlist[];
 /** \endcond */
 
+#define CLIENT_ERRORS \
+       PARA_ERROR(CLIENT_SYNTAX, "syntax error"), \
+       PARA_ERROR(INVALID_CHALLENGE, "did not receive valid challenge"), \
+       PARA_ERROR(CLIENT_AUTH, "authentication failed"), \
+       PARA_ERROR(SHORT_CLIENT_WRITE, "short client write"), \
+       PARA_ERROR(NO_CONFIG, "config file not found"), \
+
 #define SCHED_ERRORS \
        PARA_ERROR(TASK_KILLED, "task killed"), \
        PARA_ERROR(NO_SUCH_TASK, "task not found"), \
@@ -524,6 +532,7 @@ SS_ENUM(WRITE_COMMON);
 SS_ENUM(ALSA_WRITER);
 SS_ENUM(FILE_WRITER);
 SS_ENUM(RINGBUFFER);
+SS_ENUM(CLIENT);
 /** \endcond */
 #undef PARA_ERROR
 /* rest of the world only sees the error text */
index d2b34c4..3d72c7c 100644 (file)
@@ -185,8 +185,8 @@ static int http_recv_open(struct receiver_node *rn)
        rn->private_data = para_calloc(sizeof(struct private_http_recv_data));
        phd = rn->private_data;
        PARA_NOTICE_LOG("phd = %p, rn = %p\n", phd, rn);
-       ret = -E_HOST_INFO;
-       if (!(he = get_host_info(conf->host_arg)))
+       ret = get_host_info(conf->host_arg, &he);
+       if (!ret < 0)
                goto err_out;
        /* get new socket */
        ret = -E_SOCKET;
diff --git a/net.c b/net.c
index d4472c0..582fa04 100644 (file)
--- a/net.c
+++ b/net.c
@@ -21,7 +21,6 @@
 #include "para.h"
 #include "net.h"
 #include "string.h"
-#include <netdb.h>
 #include "error.h"
 
 extern void (*crypt_function_recv)(unsigned long len, const unsigned char *indata, unsigned char *outdata);
@@ -204,11 +203,12 @@ int recv_buffer(int fd, char *buf, ssize_t size)
  * \return The hostent structure or a NULL pointer if an error occurs
  * \sa gethostbyname(2)
  */
-struct hostent *get_host_info(char *host)
+int get_host_info(char *host, struct hostent **ret)
 {
        PARA_INFO_LOG("getting host info of %s\n", host);
        /* FIXME: gethostbyname() is obsolete */
-       return gethostbyname(host);
+       *ret = gethostbyname(host);
+       return *ret? 1 : -E_HOST_INFO;
 }
 
 /**
diff --git a/net.h b/net.h
index f204666..9f6af75 100644 (file)
--- a/net.h
+++ b/net.h
@@ -28,7 +28,8 @@
 #define UNIX_PATH_MAX 108
 #endif
 
-struct hostent *get_host_info(char *);
+#include <netdb.h> /* hostent */
+int get_host_info(char *host, struct hostent **ret);
 int get_socket(void);
 void init_sockaddr(struct sockaddr_in*, int, const struct hostent*);
 int para_connect(int, struct sockaddr_in *);