Ignore:
Timestamp:
Jan 9, 2017, 11:09:38 AM (2 years ago)
Author:
jrpelegrina
Message:

Update new version: 3.15.02

File:
1 edited

Legend:

Unmodified
Added
Removed
  • filezilla/trunk/fuentes/src/putty/network.h

    r130 r3185  
    5959     *    to fall back to. When it _is_ fatal, the closing()
    6060     *    function will be called.
     61     *  - type==2 means that error_msg contains a line of generic
     62     *    logging information about setting up the connection. This
     63     *    will typically be a wodge of standard-error output from a
     64     *    proxy command, so the receiver should probably prefix it to
     65     *    indicate this.
    6166     */
    6267    int (*closing)
     
    101106                    int local_host_only, Conf *conf, int addressfamily);
    102107SockAddr name_lookup(const char *host, int port, char **canonicalname,
    103                      Conf *conf, int addressfamily);
     108                     Conf *conf, int addressfamily, void *frontend_for_logging,
     109                     const char *lookup_reason_for_logging);
    104110int proxy_for_destination (SockAddr addr, const char *hostname, int port,
    105111                           Conf *conf);
     
    212218Socket new_error_socket(const char *errmsg, Plug plug);
    213219
    214 /********** SSL stuff **********/
    215 
    216 /*
    217  * This section is subject to change, but you get the general idea
    218  * of what it will eventually look like.
    219  */
    220 
    221 typedef struct certificate *Certificate;
    222 typedef struct our_certificate *Our_Certificate;
    223     /* to be defined somewhere else, somehow */
    224 
    225 typedef struct ssl_client_socket_function_table **SSL_Client_Socket;
    226 typedef struct ssl_client_plug_function_table **SSL_Client_Plug;
    227 
    228 struct ssl_client_socket_function_table {
    229     struct socket_function_table base;
    230     void (*renegotiate) (SSL_Client_Socket s);
    231     /* renegotiate the cipher spec */
    232 };
    233 
    234 struct ssl_client_plug_function_table {
    235     struct plug_function_table base;
    236     int (*refuse_cert) (SSL_Client_Plug p, Certificate cert[]);
    237     /* do we accept this certificate chain?  If not, why not? */
    238     /* cert[0] is the server's certificate, cert[] is NULL-terminated */
    239     /* the last certificate may or may not be the root certificate */
    240      Our_Certificate(*client_cert) (SSL_Client_Plug p);
    241     /* the server wants us to identify ourselves */
    242     /* may return NULL if we want anonymity */
    243 };
    244 
    245 SSL_Client_Socket sk_ssl_client_over(Socket s,  /* pre-existing (tcp) connection */
    246                                      SSL_Client_Plug p);
    247 
    248 #define sk_renegotiate(s) (((*s)->renegotiate) (s))
    249 
    250 int recv_peek(Socket sk, char* buf, int len);
     220/* ----------------------------------------------------------------------
     221 * Functions defined outside the network code, which have to be
     222 * declared in this header file rather than the main putty.h because
     223 * they use types defined here.
     224 */
     225
     226/*
     227 * Exports from be_misc.c.
     228 */
     229void backend_socket_log(void *frontend, int type, SockAddr addr, int port,
     230                        const char *error_msg, int error_code, Conf *conf,
     231                        int session_started);
     232typedef struct bufchain_tag bufchain;  /* rest of declaration in misc.c */
     233void log_proxy_stderr(Plug plug, bufchain *buf, const void *vdata, int len);
    251234
    252235#endif
Note: See TracChangeset for help on using the changeset viewer.