Changeset 2637

Timestamp:

02/08/09 12:17:37 (2 years ago)

Author:

kuhlmann

Message:

move socks 5 settings to connection specific options

Files:

• climm/doc/climmrc.5 (modified) (3 diffs)
• climm/include/connection.h (modified) (1 diff)
• climm/include/preferences.h (modified) (2 diffs)
• climm/include/util_opts.h (modified) (2 diffs)
• climm/src/connection.c (modified) (1 diff)
• climm/src/file_util.c (modified) (8 diffs)
• climm/src/oscar_dc.c (modified) (1 diff)
• climm/src/util_io.c (modified) (15 diffs)
• climm/src/util_opts.c (modified) (1 diff)

climm/doc/climmrc.5

@@ -122 +122 @@
-Remote control FIFOs do not use this setting.
-.RE
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-.TP
-.BI s5_host \ <host>
@@ -140 +139 @@
-Connect to socks 5 proxy listening on port
-.IR port .
-.TP
-.BI s5_auth \ <number>
-Set
-.I number
-to 0 to omit authentication and 1 to do authentication.
-.TP
-.BI s5_name \ <name>
@@ -155 +149 @@
-.I password
-to socks 5 proxy.
+.RE
+.SH GENERAL
+The
+.B General
+section includes general options and some strings to override.
-.PP
-A few book-keeping options are usually placed at the beginning of

climm/include/connection.h

@@ -131 +131 @@
-UWORD          ConnectionServerNType (const char *type, char del);
-val_t          ConnectionPrefVal (Server *conn, UDWORD flag);
+const char    *ConnectionPrefStr (Server *conn, UDWORD flag);
-
-#define ConnectionC(t)       ConnectionC (t DEBUGARGS)

climm/include/preferences.h

@@ -9 +9 @@
-struct Preferences_s
-{
-    char  *s5Host;      /* socks 5 settings */
-    char  *s5Name;
-    char  *s5Pass;
-    UWORD  s5Port;
-    BOOL   s5Use;
-    BOOL   s5Auth;
-
-    char  *locale;      /* the used locale (stripped of encoding) */
-    char  *locale_orig; /* the original locale (as from ENV) */
@@ -43 +36 @@
-    SBYTE  autoupdate;
-
-
-
+d
+d
-
-#ifdef ENABLE_TCL

climm/include/util_opts.h

@@ -88 +88 @@
-
-#define CO_SCRIPT        (COF_BOOL    | CO_GLOBAL  | 0x000104UL) /* open a scripting connection       */
+#define CO_S5USE         (COF_BOOL    | CO_SERVER  | 0x000404UL) /* use Socks 5 proxy                 */
-
-#define CO_ENCODING      (COF_NUMERIC | CO_CONTACT | 0x06UL) /* the default encoding for this contact */
@@ -119 +120 @@
-
-#define CO_OTRPOLICY     (COF_STRING  | CO_CONTACT | 0x40UL) /* OTR policy for a contact */
+
+#define CO_S5HOST        (COF_STRING  | CO_SERVER  | 0x50UL) /* the Socks 5 host */
+#define CO_S5PORT        (COF_NUMERIC | CO_SERVER  | 0x51UL) /* the Socks 5 port */
+#define CO_S5NAME        (COF_STRING  | CO_SERVER  | 0x52UL) /* the Socks 5 user name */
+#define CO_S5PASS        (COF_STRING  | CO_SERVER  | 0x53UL) /* the Socks 5 user password */
-
-#define CO_COLORNONE     (COF_COLOR   | CO_GLOBAL  | 0x80UL) /* the escape sequence to print for no color              */

climm/src/connection.c

@@ -504 +504 @@
-}
-
+/*
+ * Query an option for a contact group
+ */
+const char *ConnectionPrefStr (Server *serv, UDWORD flag)
+{
+    const char *res = 0;
+    if (serv->contacts && OptGetStr (&serv->copts, flag, &res))
+        return res;
+    if (OptGetStr (&prG->copts, flag, &res))
+        return res;
+    return 0;
+}
+

climm/src/file_util.c

@@ -237 +237 @@
-    }
-
-    prG->s5Use = 0;
-    prG->s5Port = 0;
-
-    rl_print (i18n (1784, "If you are firewalled, you may need to use a SOCKS5 server. If you do, please enter its hostname or IP address. Otherwise, or if unsure, just press return.\n"));
-    rl_printf ("%s ", i18n (1094, "SOCKS5 server:"));
@@ -249 +246 @@
-        if (strchr (line->txt, ':'))
-        {
-prG->s5Host
-prG->s5Host
-prG->s5Port = atoi (t + 1
+char *tmp
+tmp
+OptSetVal (&prG->copts, CO_S5PORT, atoi (t + 1)
-            *t = '\0';
+            OptSetStr (&prG->copts, CO_S5HOST, tmp);
+            free (tmp);
-        }
-        else
-        {
-
+
+
-            rl_print (i18n (1786, "I also need the port the socks server listens on. If unsure, press return for the default port.\n"));
-            rl_printf ("%s ", i18n (1095, "SOCKS5 port:"));
@@ -262 +262 @@
-            line = UtilIOReadline (stdin);
-            if (line)
-
+
+
+
+
-        }
-
-
-
-
-
-
-
+
-
-        rl_print ("\n");
@@ -279 +276 @@
-        if (line && line->len)
-        {
-
-
+
-            rl_print (i18n (1788, "Now I also need the password for this user.\n"));
-            rl_printf ("%s ", i18n (1097, "SOCKS5 password:"));
@@ -286 +282 @@
-            line = UtilIOReadline (stdin);
-            if (line && line->len)
-prG->s5Pass = strdup (
+OptSetStr (&prG->copts, CO_S5PASS, 
-        }
-    }
@@ -531 +527 @@
-                {
-                    PrefParseInt (i);
-
+
+
-                }
-                else if (!strcasecmp (cmd, "s5_host"))
-                {
-                    PrefParse (tmp);
-
+
+
-                }
-                else if (!strcasecmp (cmd, "s5_port"))
-                {
-                    PrefParseInt (i);
-
+
+
-                }
-                else if (!strcasecmp (cmd, "s5_auth"))
-                {
-                    PrefParseInt (i);
-prG->s5Auth = i
+dep = 55
-                }
-                else if (!strcasecmp (cmd, "s5_name"))
-                {
-                    PrefParse (tmp);
-
+
+
-                }
-                else if (!strcasecmp (cmd, "s5_pass"))
-                {
-                    PrefParse (tmp);
-
+
+
-                }
-                else if (!strcasecmp (cmd, "verbose"))
@@ -1254 +1255 @@
-            case TYPE_SERVER:
-                serv->c_open = &ConnectionInitServer;
-prG->s5Use && 
+
-                    serv->pref_version = 2;
-                break;
@@ -1761 +1762 @@
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    fprintf (rcf, "\n#in seconds\nauto_away %lu\n", UD2UL (prG->away_time));
-    fprintf (rcf, "\n#For dumb terminals that don't wrap set this.");

climm/src/oscar_dc.c

@@ -282 +282 @@
-    peer->dispatch    = &TCPDispatchShake;
-
-prG->s5Use
+ConnectionPrefVal (list->serv, CO_S5USE)
-    {
-        peer->sok = list->sok;

climm/src/util_io.c

@@ -113 +113 @@
-        rl_print (i18n (1056, "Socket created, attempting to connect.\n"));
-
-prG->s5Use
+ConnectionPrefVal (conn->serv, CO_S5USE)
-    {
-        sin.sin_addr.s_addr = INADDR_ANY;
@@ -131 +131 @@
-        s5OurPort = ntohs (sin.sin_port);
-
-prG->s5Host
+ConnectionPrefStr (conn->serv, CO_S5HOST)
-        if (!~s5sin.sin_addr.s_addr)        /* name isn't n.n.n.n so must be DNS */
-        {
-prG->s5Host
+ConnectionPrefStr (conn->serv, CO_S5HOST)
-            if (!host_struct)
-            {
-                if (prG->verbose || (conn->serv && conn == conn->serv->conn))
-                {
-prG->s5Host
+ConnectionPrefStr (conn->serv, CO_S5HOST)
-                    rl_print ("\n");
-                }
@@ -148 +148 @@
-        }
-        s5sin.sin_family = AF_INET;     /* we're using the inet not appletalk */
-prG->s5Port
+ConnectionPrefVal (conn->serv, CO_S5PORT)
-        s5Sok = socket (AF_INET, SOCK_STREAM, 0);       /* create the unconnected socket */
-        if (s5Sok < 0)
@@ -170 +170 @@
-        buf[0] = 5;             /* protocol version */
-        buf[1] = 1;             /* number of methods */
-*prG->s5Name || !*prG->s5Pass || !prG->s5Auth
+ConnectionPrefStr (conn->serv, CO_S5NAME) || !ConnectionPrefStr (conn->serv, CO_S5PASS)
-            buf[2] = 0;         /* no authorization required */
-        else
@@ -176 +176 @@
-        send (s5Sok, buf, 3, 0);
-        res = recv (s5Sok, buf, 2, 0);
-strlen (prG->s5Name) && strlen (prG->s5Pass) && prG->s5Auth
+buf[2]
-        {
-            if (res != 2 || buf[0] != 5 || buf[1] != 2) /* username/password authentication */
@@ -190 +190 @@
-            }
-            buf[0] = 1;         /* version of subnegotiation */
-prG->s5Name
-prG->s5Name
-prG->s5Pass
-prG->s5Pass
+ConnectionPrefStr (conn->serv, CO_S5NAME)
+ConnectionPrefStr (conn->serv, CO_S5NAME)
+ConnectionPrefStr (conn->serv, CO_S5PASS)
+ConnectionPrefStr (conn->serv, CO_S5PASS)
-            send (s5Sok, buf, buf[1] + buf[2 + buf[1]] + 3, 0);
-            res = recv (s5Sok, buf, 2, 0);
@@ -267 +267 @@
-    sin.sin_port = htons (conn->port);
-
-prG->s5Use
+ConnectionPrefVal (conn->serv, CO_S5USE)
-    {
-        memcpy (&sin.sin_addr.s_addr, &buf[4], 4);
@@ -357 +357 @@
-    if (rc == -1)
-        CONN_FAIL_RC (i18n (1950, "Couldn't set socket nonblocking"));
-prG->s5Use
-
-prG->s5Use
+ConnectionPrefVal (conn->serv, CO_S5USE)
+
+ConnectionPrefVal (conn->serv, CO_S5USE) && ConnectionPrefStr (conn->serv, CO_S5HOST)
-        {
-            origserver = conn->server;
-            origip     = conn->ip;
-            origport   = conn->port;
-prG->s5Host
-prG->s5Port
+strdup (ConnectionPrefStr (conn->serv, CO_S5HOST))
+ConnectionPrefVal (conn->serv, CO_S5PORT)
-            conn->ip     = -1;
-        }
@@ -387 +387 @@
-        sin.sin_addr.s_addr = htonl (conn->ip);
-        
-
-
+
+
+
-            conn->server = origserver;
-            conn->port   = origport;
@@ -409 +410 @@
-                if (rl_pos () > 0)
-                     rl_print (i18n (1634, "ok.\n"));
-prG->s5Use
+ConnectionPrefVal (conn->serv, CO_S5USE)
-            {
-                QueueEnqueueData (conn, QUEUE_CON_TIMEOUT, conn->ip,
@@ -572 +573 @@
-                conn->connect += CONNECT_SOCKS_ADD;
-            case 1:
-prG->s5Use
+ConnectionPrefVal (conn->serv, CO_S5USE)
-                    CONN_OK
-
@@ -578 +579 @@
-                conn->connect |= CONNECT_SELECT_R;
-                conn->connect &= ~CONNECT_SELECT_W & ~CONNECT_SELECT_X;
-
+
+
+
+
-                return;
-            case 2:
-                rc = sockread (conn->sok, buf, 2);
-                CONN_CHECK (i18n (1601, "[SOCKS] General SOCKS server failure"));
-prG->s5Auth
+ConnectionPrefVal (conn->serv, CO_S5NAME) && ConnectionPrefVal (conn->serv, CO_S5PASS)
-                    CONN_FAIL (i18n (1599, "[SOCKS] Authentication method incorrect"));
-
@@ -589 +593 @@
-                if (buf[1] == 2)
-                {
-prG->s5Name
-prG->s5Name, (char) strlen (prG->s5Pass), prG->s5Pass
+ConnectionPrefStr (conn->serv, CO_S5NAME)
+ConnectionPrefStr (conn->serv, CO_S5NAME), (char) strlen (ConnectionPrefStr (conn->serv, CO_S5PASS)), ConnectionPrefStr (conn->serv, CO_S5NAME)
-                    sockwrite (conn->sok, buf, len);
-                    return;
@@ -934 +938 @@
-    UBYTE *body = NULL, *data = pak->data;
-
-prG->s5Use
+ConnectionPrefVal (conn->serv, CO_S5USE)
-    {
-        s5len = 10;
@@ -965 +969 @@
-    int s5len;
-    
-prG->s5Use
+ConnectionPrefVal (conn->serv, CO_S5USE)
-    pak = PacketC ();
-    
-prG->s5Use
+ConnectionPrefVal (conn->serv, CO_S5USE)
-    
-    if (pak->len <= 4 + s5len || pak->len == (UWORD)-1)

climm/src/util_opts.c

@@ -96 +96 @@
-  { "scripting",     CO_SCRIPT        },
-  { "scriptingpath", CO_SCRIPT_PATH   },
+  { "s5_use",        CO_S5USE         },
+  { "s5_port",       CO_S5PORT        },
+  { "s5_host",       CO_S5HOST        },
+  { "s5_name",       CO_S5NAME        },
+  { "s5_pass",       CO_S5PASS        },
-#ifdef ENABLE_OTR
-  { "otrpolicy",     CO_OTRPOLICY     },