Changeset 534 for trunk/src/ocatlibe.c

Timestamp:

11/29/09 22:37:56 (2 years ago)

Author:

eagle

Message:

merged GarliCat branch back into trunk
onioncat-privatehosts.pl added (code by zzz)

Location:

trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/ocatlibe.c (modified) (2 diffs)

trunk/src/ocatlibe.c

@@ -138 +138 @@
 
 
-void add_listener(const char *buf, const char *def)
-{
+void add_listener(const char *buf)
+{
+   struct sockaddr_in6 saddr;
+
+   if (strsockaddr(buf, &saddr) == -1)
+      log_msg(LOG_EMERG, "could not convert address string '%s'", buf), exit(1);
+
    CNF(oc_listen_cnt)++;
    log_debug("reallocating sockaddr list to %d elements", CNF(oc_listen_cnt));
@@ -147 +152 @@
       log_msg(LOG_ERR, "could not get memory for listener fds: \"%s\"", strerror(errno)), exit(1);
 
-   log_debug("allocating sockaddr mem for \"%s\"", def);
+   log_debug("allocating sockaddr mem for \"%s\"", buf);
    if (!(CNF(oc_listen)[CNF(oc_listen_cnt) - 1] = calloc(1, sizeof(struct sockaddr_in6))))
       log_msg(LOG_ERR, "could not get memory for listener : \"%s\"", strerror(errno)), exit(1);
 
    CNF(oc_listen_fd)[CNF(oc_listen_cnt) - 1] = -1;
-
-   if (def)
-      if (strsockaddr(def, CNF(oc_listen)[CNF(oc_listen_cnt) - 1]) == -1)
-         log_msg(LOG_EMERG, "illegal default string '%s'", def), exit(1);
-
-   if (strsockaddr(buf, CNF(oc_listen)[CNF(oc_listen_cnt) - 1]) == -1)
-      log_msg(LOG_EMERG, "could not convert address string '%s'", buf), exit(1);
+   memcpy(CNF(oc_listen)[CNF(oc_listen_cnt) - 1], &saddr, sizeof(saddr));
 }