Changeset 6034 for pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c
- Timestamp:
- Jul 1, 2019 5:41:29 AM (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c
r6022 r6034 211 211 } 212 212 213 #define ERROR_LOG(msg, err) \ 214 PJ_LOG(2,("SSL", "%s (%s): Level: %d err: <%lu> <%s-%s-%s> len: %d", \ 215 msg, action, level, err, \ 216 (ERR_lib_error_string(err)? ERR_lib_error_string(err): "???"), \ 217 (ERR_func_error_string(err)? ERR_func_error_string(err):"???"),\ 218 (ERR_reason_error_string(err)? \ 219 ERR_reason_error_string(err): "???"), len)); 220 221 static void SSLLogErrors(char * action, int ret, int ssl_err, int len) 213 #define ERROR_LOG(msg, err, ssock) \ 214 { \ 215 char buf[PJ_INET6_ADDRSTRLEN+10]; \ 216 PJ_LOG(2,("SSL", "%s (%s): Level: %d err: <%lu> <%s-%s-%s> len: %d " \ 217 "peer: %s", \ 218 msg, action, level, err, \ 219 (ERR_lib_error_string(err)? ERR_lib_error_string(err): "???"), \ 220 (ERR_func_error_string(err)? ERR_func_error_string(err):"???"),\ 221 (ERR_reason_error_string(err)? \ 222 ERR_reason_error_string(err): "???"), len, \ 223 (ssock && pj_sockaddr_has_addr(&ssock->rem_addr)? \ 224 pj_sockaddr_print(&ssock->rem_addr, buf, sizeof(buf), 3):"???")));\ 225 } 226 227 static void SSLLogErrors(char * action, int ret, int ssl_err, int len, 228 pj_ssl_sock_t *ssock) 222 229 { 223 230 char *ssl_err_str = SSLErrorString(ssl_err); … … 234 241 int level = 0; 235 242 while (err2) { 236 ERROR_LOG("SSL_ERROR_SYSCALL", err2 );243 ERROR_LOG("SSL_ERROR_SYSCALL", err2, ssock); 237 244 level++; 238 245 err2 = ERR_get_error(); … … 265 272 266 273 while (err2) { 267 ERROR_LOG("SSL_ERROR_SSL", err2 );274 ERROR_LOG("SSL_ERROR_SSL", err2, ssock); 268 275 level++; 269 276 err2 = ERR_get_error(); … … 303 310 int len = 0; //dummy 304 311 305 ERROR_LOG("STATUS_FROM_SSL_ERR", err );312 ERROR_LOG("STATUS_FROM_SSL_ERR", err, ssock); 306 313 level++; 307 314 … … 309 316 if (err == SSL_ERROR_SSL) { 310 317 err = ERR_get_error(); 311 ERROR_LOG("STATUS_FROM_SSL_ERR", err );318 ERROR_LOG("STATUS_FROM_SSL_ERR", err, ssock); 312 319 } 313 320 … … 327 334 328 335 /* Dig for more from OpenSSL error queue */ 329 SSLLogErrors(action, ret, err, len );336 SSLLogErrors(action, ret, err, len, ssock); 330 337 331 338 ssock->last_err = ssl_err;
Note: See TracChangeset
for help on using the changeset viewer.