Mercurial > pidgin
comparison libpurple/sslconn.h @ 18929:67cb28c0ec89
applied changes from e52b685d84ca8874da6e3e71199829e513500642
through 504a3dc38ec168dab1f4443c13d14858db47cd70
- Pulling the ssl_connect_with_host_fd change from soc.2007.xmpp
author | William Ehlhardt <williamehlhardt@gmail.com> |
---|---|
date | Thu, 21 Jun 2007 19:21:47 +0000 |
parents | 33690062e8b3 |
children | e634122cec47 |
comparison
equal
deleted
inserted
replaced
18928:299022c9b32d | 18929:67cb28c0ec89 |
---|---|
160 PurpleSslErrorFunction error_func, | 160 PurpleSslErrorFunction error_func, |
161 void *data); | 161 void *data); |
162 | 162 |
163 /** | 163 /** |
164 * Makes a SSL connection using an already open file descriptor. | 164 * Makes a SSL connection using an already open file descriptor. |
165 * DEPRECATED. Use purple_ssl_connect_with_host_fd instead. | |
165 * | 166 * |
166 * @param account The account making the connection. | 167 * @param account The account making the connection. |
167 * @param fd The file descriptor. | 168 * @param fd The file descriptor. |
168 * @param func The SSL input handler function. | 169 * @param func The SSL input handler function. |
169 * @param error_func The SSL error handler function. | 170 * @param error_func The SSL error handler function. |
172 * @return The SSL connection handle. | 173 * @return The SSL connection handle. |
173 */ | 174 */ |
174 PurpleSslConnection *purple_ssl_connect_fd(PurpleAccount *account, int fd, | 175 PurpleSslConnection *purple_ssl_connect_fd(PurpleAccount *account, int fd, |
175 PurpleSslInputFunction func, | 176 PurpleSslInputFunction func, |
176 PurpleSslErrorFunction error_func, | 177 PurpleSslErrorFunction error_func, |
177 void *data); | 178 void *data); |
179 | |
180 /** | |
181 * Makes a SSL connection using an already open file descriptor. | |
182 * | |
183 * @param account The account making the connection. | |
184 * @param fd The file descriptor. | |
185 * @param func The SSL input handler function. | |
186 * @param error_func The SSL error handler function. | |
187 * @param host The hostname of the other peer (to verify the CN) | |
188 * @param data User-defined data. | |
189 * | |
190 * @return The SSL connection handle. | |
191 */ | |
192 PurpleSslConnection *purple_ssl_connect_with_host_fd(PurpleAccount *account, int fd, | |
193 PurpleSslInputFunction func, | |
194 PurpleSslErrorFunction error_func, | |
195 const char *host, | |
196 void *data); | |
178 | 197 |
179 /** | 198 /** |
180 * Adds an input watcher for the specified SSL connection. | 199 * Adds an input watcher for the specified SSL connection. |
181 * Once the SSL handshake is complete, use this to watch for actual data across it. | 200 * Once the SSL handshake is complete, use this to watch for actual data across it. |
182 * | 201 * |