comparison: libpurple/sslconn.h
libpurple/sslconn.h
- branch
- soc.2007.xmpp
- changeset 17765
- 04aaa6965b10
- parent 17344
- 158859c42ae9
- child 17767
- 2e90c77810f5
equal
deleted
inserted
replaced
| 17764:f9186fabb483 | 17765:04aaa6965b10 |
|---|---|
| 152 PurpleSslErrorFunction error_func, | 152 PurpleSslErrorFunction error_func, |
| 153 void *data); | 153 void *data); |
| 154 | 154 |
| 155 /** | 155 /** |
| 156 * Makes a SSL connection using an already open file descriptor. | 156 * Makes a SSL connection using an already open file descriptor. |
| 157 * DEPRECATED. Use purple_ssl_connect_with_host_fd instead. | |
| 157 * | 158 * |
| 158 * @param account The account making the connection. | 159 * @param account The account making the connection. |
| 159 * @param fd The file descriptor. | 160 * @param fd The file descriptor. |
| 160 * @param func The SSL input handler function. | 161 * @param func The SSL input handler function. |
| 161 * @param error_func The SSL error handler function. | 162 * @param error_func The SSL error handler function. |
| 164 * @return The SSL connection handle. | 165 * @return The SSL connection handle. |
| 165 */ | 166 */ |
| 166 PurpleSslConnection *purple_ssl_connect_fd(PurpleAccount *account, int fd, | 167 PurpleSslConnection *purple_ssl_connect_fd(PurpleAccount *account, int fd, |
| 167 PurpleSslInputFunction func, | 168 PurpleSslInputFunction func, |
| 168 PurpleSslErrorFunction error_func, | 169 PurpleSslErrorFunction error_func, |
| 169 void *data); | 170 void *data); |
| 171 | |
| 172 /** | |
| 173 * Makes a SSL connection using an already open file descriptor. | |
| 174 * | |
| 175 * @param account The account making the connection. | |
| 176 * @param fd The file descriptor. | |
| 177 * @param func The SSL input handler function. | |
| 178 * @param error_func The SSL error handler function. | |
| 179 * @param host The hostname of the other peer (to verify the CN) | |
| 180 * @param data User-defined data. | |
| 181 * | |
| 182 * @return The SSL connection handle. | |
| 183 */ | |
| 184 PurpleSslConnection *purple_ssl_connect_with_host_fd(PurpleAccount *account, int fd, | |
| 185 PurpleSslInputFunction func, | |
| 186 PurpleSslErrorFunction error_func, | |
| 187 const char *host, | |
| 188 void *data); | |
| 170 | 189 |
| 171 /** | 190 /** |
| 172 * Adds an input watcher for the specified SSL connection. | 191 * Adds an input watcher for the specified SSL connection. |
| 173 * Once the SSL handshake is complete, use this to watch for actual data across it. | 192 * Once the SSL handshake is complete, use this to watch for actual data across it. |
| 174 * | 193 * |
