pidgin/pidgin

novell: Remove unused unencrypted connection code.

2019-11-02, Elliott Sales de Andrade
5fd446031612
Parents b8cba5cc6498
Children 1f2ef108cfcb
novell: Remove unused unencrypted connection code.

The connection is only ever made with `purple_ssl_connect`, and with
`use_ssl` set to `TRUE`.
3 files changed, 2 insertions(+), 20 deletions(-)
  • +2 -12
    libpurple/protocols/novell/nmconn.c
  • +0 -6
    libpurple/protocols/novell/nmconn.h
  • +0 -2
    libpurple/protocols/novell/novell.c
    • --- a/libpurple/protocols/novell/nmconn.c Fri Nov 01 01:39:33 2019 -0400
    +++ b/libpurple/protocols/novell/nmconn.c Sat Nov 02 16:33:36 2019 -0400
    @@ -198,12 +198,7 @@
    if (conn == NULL || buff == NULL)
    return -1;
    - if (!conn->use_ssl)
    - return (write(conn->fd, buff, len));
    - else if (conn->ssl_conn && conn->ssl_conn->write)
    - return (conn->ssl_conn->write(conn->ssl_conn->data, buff, len));
    - else
    - return -1;
    + return conn->ssl_conn->write(conn->ssl_conn->data, buff, len);
    }
    int
    @@ -212,12 +207,7 @@
    if (conn == NULL || buff == NULL)
    return -1;
    - if (!conn->use_ssl)
    - return (read(conn->fd, buff, len));
    - else if (conn->ssl_conn && conn->ssl_conn->read)
    - return ((conn->ssl_conn->read)(conn->ssl_conn->data, buff, len));
    - else
    - return -1;
    + return conn->ssl_conn->read(conn->ssl_conn->data, buff, len);
    }
    NMERR_T
    --- a/libpurple/protocols/novell/nmconn.h Fri Nov 01 01:39:33 2019 -0400
    +++ b/libpurple/protocols/novell/nmconn.h Sat Nov 02 16:33:36 2019 -0400
    @@ -39,9 +39,6 @@
    /* The port that we are connecting to. */
    int port;
    - /* The file descriptor of the socket for the connection. */
    - int fd;
    -
    /* The transaction counter. */
    int trans_id;
    @@ -51,9 +48,6 @@
    /* Are we connected? TRUE if so, FALSE if not. */
    gboolean connected;
    - /* Are we running in secure mode? */
    - gboolean use_ssl;
    -
    /* Have we been redirected? */
    gboolean redirect;
    --- a/libpurple/protocols/novell/novell.c Fri Nov 01 01:39:33 2019 -0400
    +++ b/libpurple/protocols/novell/novell.c Sat Nov 02 16:33:36 2019 -0400
    @@ -2205,8 +2205,6 @@
    purple_connection_update_progress(gc, _("Connecting"),
    1, NOVELL_CONNECT_STEPS);
    - user->conn->use_ssl = TRUE;
    -
    user->conn->ssl_conn = g_new0(NMSSLConn, 1);
    user->conn->ssl_conn->read = (nm_ssl_read_cb) purple_ssl_read;
    user->conn->ssl_conn->write = (nm_ssl_write_cb) purple_ssl_write;