Changeset 850 for releases

Timestamp:

04/24/06 20:57:25 (3 years ago)

Author:

aj

Message:

use limits.h where necessary.
convert reader(int) to path in ifdhandler, not ct_socket_listen.
use ct_format_path also in ifdproxy code.
fix solaris compile (thanks to William Wanders).

Location:

releases/openct-0.6.7/src

Files:

• ct/socket.c (modified) (2 diffs)
• ifd/ifdhandler.c (modified) (5 diffs)
• ifd/ifdproxy.c (modified) (4 diffs)
• ifd/ria.c (modified) (3 diffs)
• ifd/sys-linux.c (modified) (1 diff)
• ifd/sys-solaris.c (modified) (2 diffs)
• ifd/sys-sunray.c (modified) (1 diff)
• include/openct/socket.h (modified) (1 diff)

releases/openct-0.6.7/src/ct/socket.c

@@ -23 +23 @@
 #include <arpa/inet.h>
 #include <netdb.h>
+#include <limits.h>
 
 #include <openct/logging.h>
@@ -240 +241 @@
  * Listen on a socket
  */
-int ct_socket_listen(ct_socket_t * sock, int reader, int mode)
-{
-        char path[PATH_MAX];
-        char file[PATH_MAX];
-
-        snprintf(file, PATH_MAX, "%d", reader);
-        if (! ct_format_path(path, PATH_MAX, file)) {
-                return -1;
-        }
-
+int ct_socket_listen(ct_socket_t * sock, const char *path, int mode)
+{
         ct_socket_close(sock);
         if (ct_socket_make(sock, CT_MAKESOCK_BIND, path) < 0)

releases/openct-0.6.7/src/ifd/ifdhandler.c

@@ -22 +22 @@
 #include <limits.h>
 
+#include <openct/path.h>
 #include <openct/ifd.h>
 #include <openct/conf.h>
@@ -35 +36 @@
 static int opt_foreground = 0;
 static int opt_info = 0;
-static unsigned int opt_reader = -1;
+static const char *opt_reader = NULL;
 
 static void usage(int exval);
@@ -72 +73 @@
                         break;
                 case 'r':
-                        opt_reader = atoi(optarg);
+                        opt_reader = optarg;
                         break;
                 case 's':
@@ -111 +112 @@
          * prevent race condition
          */
-        status = ct_status_alloc_slot(&opt_reader);
-        if (status == NULL) {
-                ct_error("too many readers, no reader slot available");
-                return 1;
+        {
+                unsigned int r;
+                char path[PATH_MAX];
+
+                status = ct_status_alloc_slot(&r);
+                if (status == NULL) {
+                        ct_error("too many readers, no reader slot available");
+                        return 1;
+                }
+                snprintf(path,PATH_MAX,"%d",r);
+                opt_reader=strdup(path);
         }
 
@@ -177 +185 @@
         int rc;
         struct sigaction act;
+        char path[PATH_MAX];
+        char file[PATH_MAX];
+
+        if (! ct_format_path(path, PATH_MAX, file)) {
+                ct_error("ct_format_path failed!");
+                exit(1);
+        }
 
         /* Activate reader */

releases/openct-0.6.7/src/ifd/ifdproxy.c

@@ -25 +25 @@
 #include <pwd.h>
 #include <grp.h>
-
+#include <limits.h>
+
+#include <openct/path.h>
 #include <openct/socket.h>
 #include <openct/server.h>
@@ -32 +34 @@
 #include "ria.h"
 
-#define DEFAULT_SERVER_PATH     OPENCT_SOCKET_PATH "/proxy"
-
 static int opt_foreground = 0;
 static char *opt_config = NULL;
 static const char *opt_device_port = ":6666";
-static const char *opt_server_port = OPENCT_SOCKET_PATH "/proxy";
+static const char *opt_server_port = "proxy";
 static const char *opt_chroot = NULL;
 static const char *opt_user = NULL;
@@ -175 +175 @@
 {
         int rc;
+        char path[PATH_MAX];
+
+        if (! ct_format_path(path, PATH_MAX, opt_server_port)) {
+                return -1;
+        }
+
 
         if (argc != 0)
@@ -181 +187 @@
                 ct_socket_reuseaddr(1);
 
-        if ((rc = ria_svc_listen(opt_server_port, 1)) < 0) {
+        if ((rc = ria_svc_listen(path, 1)) < 0) {
                 ct_error("Cannot bind to server port \"%s\": %s\n",
-                         opt_server_port, ct_strerror(rc));
+                         path, ct_strerror(rc));
                 return rc;
         }

releases/openct-0.6.7/src/ifd/ria.c

@@ -18 +18 @@
 #include <fcntl.h>
 #include <errno.h>
-
+#include <limits.h>
+
+#include <openct/path.h>
 #include <openct/socket.h>
 #include <openct/server.h>
@@ -35 +37 @@
 {
         ria_client_t *clnt;
-        int reader;
+        char path[PATH_MAX];
         int rc;
 
-        if (scanf("5d",address,&reader) != 1) {
-                ct_error("can't parse address \"%s\"",address);
+        if (! address) {
+                return NULL;
+        }
+
+        if (! ct_format_path(path, PATH_MAX, address)) {
                 return NULL;
         }
@@ -51 +56 @@
 
         clnt->sock = ct_socket_new(1024);
-        if ((rc = ct_socket_connect(clnt->sock, reader)) < 0) {
-                ct_error("Failed to connect to RIA server %d: %s",
-                         reader, ct_strerror(rc));
+        if ((rc = ct_socket_connect(clnt->sock, path)) < 0) {
+                ct_error("Failed to connect to RIA server \"%s\": %s",
+                         path, ct_strerror(rc));
                 ria_free(clnt);
                 return NULL;

releases/openct-0.6.7/src/ifd/sys-linux.c

@@ -25 +25 @@
 #include <fcntl.h>
 #include <errno.h>
+#include <limits.h>
 #ifdef HAVE_LIBUSB
 #include <usb.h>

releases/openct-0.6.7/src/ifd/sys-solaris.c

@@ -186 +186 @@
 }
 
+void
 close_ep(int interface, int endpoint, int direction)
 {
@@ -529 +530 @@
 }
 
-int ifd_sysdep_usb:open(const char *device)
+int ifd_sysdep_usb_open(const char *device)
 {
         return open(device, O_RDWR);

releases/openct-0.6.7/src/ifd/sys-sunray.c

@@ -21 +21 @@
 #include <unistd.h>
 #include <errno.h>
+#include <limits.h>
+
 #include <openct/driver.h>
 #define USB_READ_INTERRUPT_TIMEOUT_WORKAROUND 1

releases/openct-0.6.7/src/include/openct/socket.h

@@ -58 +58 @@
 extern void             ct_socket_reuseaddr(int);
 extern int              ct_socket_connect(ct_socket_t *, const char *);
-extern int              ct_socket_listen(ct_socket_t *, int, int);
+extern int              ct_socket_listen(ct_socket_t *, const char *, int);
 extern ct_socket_t *    ct_socket_accept(ct_socket_t *);
 extern void             ct_socket_close(ct_socket_t *);