Changeset 100

Timestamp:

07/03/07 19:48:26 (1 year ago)

Author:

gotoh

Message:

Allow domain name based item in xxxx_DIRECT environment variable.
No more unwanted local resolving of target hostname to judge direct or not.
Fix to terminate the program on connection timeout.

(downcase): return converted string.
(ADDRPAIR): hold target host name to eliminate resolving IP address.
(add_direct_host): New function.
(initialize_direct_addr): Accept domain notation.
(is_direct_address): Change argument type.
(domain_match): New function.
(is_direct_name): New function.
(check_direct): New function.
(open_connection): Do not resolve address for judge direct or not.
(sig_timeout): Bug fix to exit program on timeout. Thanks to Alessandro.
(main): Use check_direct() here.

Files:

• trunk/connect.c (modified) (12 diffs)

trunk/connect.c

@@ -530 +530 @@
-}
-
-
-
-
+
+
+
+
-    while ( *buf ) {
-        if ( isupper(*buf) )
@@ -538 +539 @@
-        buf++;
-    }
+    return str;                                 /* return converted arg */
-}
-
@@ -790 +792 @@
-    struct in_addr addr;
-    struct in_addr mask;
+    char *name;
-    int negative;
-};
@@ -818 +821 @@
-    mask_addr(&iaddr, mask, sizeof(iaddr));
-    s = strdup(inet_ntoa(iaddr));
-
+
+
-    free(s);
-    memcpy( &direct_addr_list[n_direct_addr_list].addr,
@@ -824 +828 @@
-    memcpy( &direct_addr_list[n_direct_addr_list].mask,
-            mask, sizeof(*mask));
+    direct_addr_list[n_direct_addr_list].name = NULL;
-    direct_addr_list[n_direct_addr_list].negative = negative;
-    n_direct_addr_list++;
-    return 0;
-}
+
+
+/* add domain/host name entry to direct name table */
+int
+add_direct_host( const char *name, int negative)
+{
+    if ( MAX_DIRECT_ADDR_LIST <= n_direct_addr_list ) {
+        error("direct address table is full!\n");
+        return -1;
+    }
+    if (*name == '*')
+        name++;
+    if (*name == '.')
+        name++;
+    debug("adding direct name entry: %s%s\n", negative? "!": "", name);
+    direct_addr_list[n_direct_addr_list].name = downcase(strdup(name));
+    direct_addr_list[n_direct_addr_list].negative = negative;
+    n_direct_addr_list++;
+    return 0;
+}
+
-
-int
@@ -845 +871 @@
-
-    assert( str != NULL );
-    debug("parsing address pair: '%s'\n", str);
-    addr->s_addr = 0;
-    mask->s_addr = 0;
@@ -949 +974 @@
-            add_direct_addr( &addr, &mask, negative );
-        } else {
-error("invalid addr format in %s: %s\n", envkey, beg
+add_direct_host( beg, negative 
-        }
-        if ( next != NULL )
@@ -966 +991 @@
-
-int
-
-
-
-
-
-
+
+
+
+
-
-    /* Note: assume IPV4 address !! */
-    for (i=0; i<n_direct_addr_list; i++ ) {
-
+
+
+
+
-        mask_addr( &iaddr, &direct_addr_list[i].mask,
-                   sizeof(struct in_addr));
-        if (cmp_addr(&iaddr, &direct_addr_list[i].addr,
-                     sizeof(struct in_addr)) == 0) {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                return 0;       /* not direct */
-
-
-
-
+
-                return 1;       /* direct*/
-            }
-        }
-    }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -1230 +1347 @@
-        debug ("No direct address are specified.\n");
-    } else {
-
-
-
-
-
-
-
-
-
-
-
+
-    }
-
@@ -1601 +1708 @@
-sig_timeout(void)
-{
-    debug( "timed out\n" );
-    signal( SIGALRM, SIG_IGN );
-    alarm( 0 );
+    error( "timed out\n" );
+    exit(1);
-}
-
@@ -1668 +1776 @@
-    struct sockaddr_in saddr;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    if (local_resolve (host, &saddr) < 0) {
-        error("can't resolve hostname: %s\n", host);
@@ -2791 +2886 @@
-#endif /* not _WIN32 */
-
+    if (check_direct(dest_host))
+        relay_method = METHOD_DIRECT;
-    /* make connection */
-    if ( relay_method == METHOD_DIRECT ) {