Changeset 2851

Timestamp:

03/06/10 19:16:56 (5 months ago)

Author:

kuhlmann

Message:

options are per server, not per connection, so rename ConnectionPref?{Str,Val} to ServerPref?{Str,Val} and update documentation accordingly

Files:

• climm/doc/climmcmds.7 (modified) (4 diffs)
• climm/include/connection.h (modified) (2 diffs)
• climm/src/connection.c (modified) (2 diffs)
• climm/src/io/io_socks5.c (modified) (3 diffs)
• climm/src/jabber_base.cpp (modified) (2 diffs)
• climm/src/oscar_base.c (modified) (3 diffs)
• climm/src/oscar_dc.c (modified) (3 diffs)
• climm/src/oscar_dc_file.c (modified) (1 diff)
• climm/src/oscar_oldicq.c (modified) (1 diff)
• climm/src/oscar_service.c (modified) (2 diffs)
• climm/src/util_io.c (modified) (2 diffs)
• climm/src/xmpp_base.c (modified) (3 diffs)

climm/doc/climmcmds.7

@@ -1006 +1006 @@
-will be used.
-.TP
-connection
+server
-Whether the current status should be visible on the web site.
-.TP
-connection
+server
-Whether to hide the (local) IP address towards other users.
-.TP
-connection
+server
-Whether authorized contacts can see the (remote) IP address.
-.TP
-connection
+server
-Whether contacts can see the (remote) IP address.
-.TP
-connection
+server
-If set, incoming messages will be counted and their originators shown
-if the status is manually changed to anything other than
@@ -1034 +1034 @@
-.IR invisible ).
-.TP
-connection
+server
-Enable the use of a socks 5 proxy. New for 0.6.4.
-.TP
-connection
+server
-Connect to socks 5 proxy on the given host. New for 0.6.4.
-.TP
-connection
+server
-Connect to socks 5 proxy listening on the given port number. New for 0.6.4.
-.TP
-connection
+server
-Identify as the given user to the socks 5 proxy. New for 0.6.4.
-.TP
-connection
+server
-Authenticate with the given password to the socks 5 proxy. New for 0.6.4.
-.TP
-connection
-
+server
+s
-the oscar protocol. If the given port is in used, the port number actually
-used is increased until a free one is found. New for 0.6.4.
-.TP
-connection
+server
-.RS
-This integer is for flags how to handle direct connections:
@@ -1079 +1079 @@
-.RE
-.TP
-connection
+server
-Log all data sent over the connection to the server into a file in
-BASEDIR/debug/.
-.TP
-connection
+server
-After login, select the given privacy list as the active list for this
-session. If the list is empty, select no privacy list as active. Otherwise,
@@ -1199 +1199 @@
-New for 0.5.
-.TP
-connection
-connection
+serv
+server
-.IR option .
-New for
+Renamed for 0.7.1, old name new in
-.TP
-.BI optglobal \ [<option>\ [<value>]]

climm/include/connection.h

@@ -115 +115 @@
-Connection    *ServerFindChild   (const Server *parent, const Contact *cont, UWORD type);
-const char    *ServerStrType     (Server *conn);
+val_t          ServerPrefVal     (Server *conn, UDWORD flag);
+const char    *ServerPrefStr     (Server *conn, UDWORD flag);
-
-Connection    *ConnectionC       (UWORD type DEBUGPARAM);
@@ -122 +124 @@
-const char    *ConnectionServerType  (UWORD type);
-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/src/connection.c

@@ -491 +491 @@
- * Query an option for a contact group
- */
-Connection
+Server
-{
-    val_t res = 0;
@@ -504 +504 @@
- * Query an option for a contact group
- */
-Connection
+Server
-{
-    const char *res = 0;

climm/src/io/io_socks5.c

@@ -108 +108 @@
-static void io_socks5_open (Connection *conn, Dispatcher *d)
-{
-Connection
-Connection
+Server
+Server
-    char *origserver = conn->server;
-    UDWORD origport = conn->port, origip = conn->ip;
@@ -151 +151 @@
-        if (rc != IO_CONNECTED)
-            return io_socks5_seterr (d, rc, d->next->funcs->f_err (conn,  d->next));
-ConnectionPrefVal (conn->serv, CO_S5NAME) && Connection
+ServerPrefVal (conn->serv, CO_S5NAME) && Server
-            e = io_util_write (conn, d->next, "\x05\x02\x02\x00", 4);            
-        else
@@ -174 +174 @@
-    if (d->flags == FLAG_SEND_CRED)
-    {
-Connection
-Connection
+Server
+Server
-        if (!socks5name || !socks5pass)
-            return io_socks5_seterr (d, IO_RW, i18n (1599, "[SOCKS] Authentication method incorrect"));

climm/src/jabber_base.cpp

@@ -1018 +1018 @@
-    if (area == gloox::LogAreaXmlIncoming)
-    {
-Connection
+Server
-            CLIMMXMPPSave (m_serv, message.c_str(), 1);
-        DebugH (DEB_XMPPIN, "%s/%s: %s", lt, la, message.c_str());
@@ -1024 +1024 @@
-    else if (area == gloox::LogAreaXmlOutgoing)
-    {
-Connection
+Server
-            CLIMMXMPPSave (m_serv, message.c_str(), 0);
-        DebugH (DEB_XMPPOUT, "%s/%s: %s", lt, la, message.c_str());

climm/src/oscar_base.c

@@ -451 +451 @@
-    }
-    
-Connection
+Server
-        FlapSave (serv, pak, FALSE);
-    
@@ -603 +603 @@
-    UtilIOConnectTCP (serv->conn);
-    rl_printf ("\n");
-Connection
+Server
-    {
-        Connection *conn = serv->oscar_dc;
@@ -688 +688 @@
-        rl_print (COLEXDENT "\r");
-    }
-Connection
+Server
-        FlapSave (serv, pak, TRUE);
-    

climm/src/oscar_dc.c

@@ -116 +116 @@
-    list->ip          = 0;
-    s_repl (&list->server, NULL);
-Connection
+Server
-    list->cont        = list->serv->conn->cont;
-
@@ -715 +715 @@
-    PacketWriteB4 (pak, peer->serv->conn->our_outside_ip); /* our (remote) IP  */
-    PacketWriteB4 (pak, peer->serv->conn->our_local_ip);   /* our (local)  IP  */
-Connection
+Server
-    PacketWrite4  (pak, peer->serv->oscar_dc->port);           /* our (other) port */
-    PacketWrite4  (pak, peer->oscar_our_session);          /* session id       */
@@ -765 +765 @@
-    PacketWriteB4 (pak, peer->serv->conn->our_outside_ip); /* our (remote) IP  */
-    PacketWriteB4 (pak, peer->serv->conn->our_local_ip);   /* our (local)  IP  */
-Connection
+Server
-    PacketWrite4  (pak, peer->serv->oscar_dc->port);           /* our (other) port */
-    PacketWrite4  (pak, peer->oscar_our_session);          /* session id       */

climm/src/oscar_dc_file.c

@@ -89 +89 @@
-    flist->version  = serv->oscar_dc->version;
-    flist->cont     = serv->oscar_dc->cont;
-Connection
+Server
-    flist->dispatch = &TCPDispatchMain;
-    

climm/src/oscar_oldicq.c

@@ -533 +533 @@
-        PacketWriteB4 (pak, 0);
-        PacketWrite1  (pak, serv->oscar_dc && serv->oscar_dc->connect & CONNECT_OK
-Connection
+Server
-        PacketWrite2  (pak, serv->oscar_dc && serv->oscar_dc->connect & CONNECT_OK
-                            ? serv->oscar_dc->version : 0);

climm/src/oscar_service.c

@@ -358 +358 @@
-    statusflag_t flags = imf_none;
-    
-Connection
+Server
-        flags |= imf_web;
-Connection
+Server
-        flags |= imf_dcauth;
-Connection
+Server
-        flags |= imf_dccont;
-    
@@ -384 +384 @@
-        PacketWriteB2 (pak, 0x0c); /* TLV 0C */
-        PacketWriteB2 (pak, 0x25);
-Connection
+Server
-        if (serv->oscar_dc && serv->oscar_dc->connect & CONNECT_OK)
-        {
-            PacketWriteB4 (pak, serv->oscar_dc->port);
-Connection
+Server
-            PacketWriteB2 (pak, serv->oscar_dc->version);
-            PacketWriteB4 (pak, serv->oscar_dc->oscar_our_session);

climm/src/util_io.c

@@ -47 +47 @@
-void UtilIOConnectTCP (Connection *conn)
-{
-Connection
+Server
-        return IOConnectSocks5 (conn);
-    return IOConnectTCP (conn);
@@ -54 +54 @@
-void UtilIOListenTCP  (Connection *conn)
-{
-Connection
+Server
-        return IOListenSocks5 (conn);
-    return IOListenTCP (conn);

climm/src/xmpp_base.c

@@ -211 +211 @@
-        DebugH (DEB_XMPPOUT, "%s", data);
-
-Connection
+Server
-        return;
-
@@ -1372 +1372 @@
-    
-    {
-Connection
+Server
-        if (list)
-            XMPPSendIqPrivacy (serv, p_active, list);
@@ -1582 +1582 @@
-                        conn->serv->xmpp_id = iks_id_new (iks_parser_stack (prs),
-                            s_sprintf ("%s@%s/climm", conn->serv->xmpp_id->user, conn->serv->xmpp_id->server));
-ConnectionPrefVal (conn->serv, CO_TAGRESSOURCE) || Connection
+ServerPrefVal (conn->serv, CO_TAGRESSOURCE) || Server
-                        conn->serv->xmpp_id = iks_id_new (iks_parser_stack (prs),
-                            s_sprintf ("%s/%s%04X%04X", conn->serv->xmpp_id->partial, conn->serv->xmpp_id->resource, rand() % 0xffff, rand() % 0xffff));